diff --git a/Manifest b/Manifest
index 3a8d618b32e3..2743b168d9ad 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29291 BLAKE2B 22569c3607efda973f03b894a446a34fae922ef11648ad2728ce125da6f385621a9054ba461555782542137a37fe33881f5566c3831eb239e830403cf0e03cc0 SHA512 268381f81e9bce9d86ecad9ad17559e048bb18e8eccb4587216eed293eb80910a933139d52a6678170b165c248ee0904e1f85ba0cd478e412c9f438a14a62085
-TIMESTAMP 2021-02-01T11:08:28Z
+MANIFEST Manifest.files.gz 29297 BLAKE2B 287a5978b1b1fce9f70f91a5108cd3f2dfd6557d4cbd49ec73629e1cee0c1000ea5d91f1fed1117617b95cc05d4638a65ba8500922ea23c69dbabb2d1a51ae17 SHA512 4938ea0f702023ce595b63b58bcc3ba86b6a80e82a96a164154414a887c6bd7634a18cf10658df283cc029f138fd0d929b70930c37e60e3ef8bec9d1748df972
+TIMESTAMP 2021-02-02T06:08:31Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmAX4SxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmAY7F9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD7Bw//d86W/9YZkgh4rtI/vUC8o8WZKovhT+eEirlEcPmWscCWVsaSgrjQSOyr
-6+vpC4mncAXIddVxEQLqx1kDRtJPXRePLS5Z+U/HATuE+AtGwI4sfhEcvm5kG4r/
-5Ut6+BeFum8DbxGSNv45uOa/lDmb0kxSpYr9/WQSRP2pEIW4s4cY5j6wkmp7S6zz
-9NIDDdnVagNtSaPH0EkUH+OwHNvhaJx196ZAItcr7f72RrViV0ogCuRr2MU/vGEu
-I4DyZzTFX+wO5jgrKFxKx4Osbr03AOjkWKXQv2zWy+bywS1Oz9bZD5Lh3NFI+Q4y
-kiWCq3u+pelIzlOv8x/ovP9vFg/zjtKmHUMp90mL+/o2XjS0sZoQKdZPx9vbzXdy
-bpIBW8yvUNTIoIbBa1gV7qUR4lZoTmMs2CX/WACmsfvph91dOYuAGnh1gzKSL5+B
-iaynuE+UWxLfUxs68/g9Bf46L3b7llxwk64TkeMFZv1OHKrT+YGDA2hAOAlF5c0e
-CMMkHzO4newMpEstX7ytrZuI/3tVlTdouciR7nagCQ+jz4F4uwN4rmmUqOo+gZtD
-LiaKwp5T6a1rYrOcj7N/Y6vypuxxJP5OKSaea8xTap9Tne+Z08Lgy+fGTgfJbveq
-CG1zmVkKaPmoF2WA1sH7gotpMfXhEGH+4FbxKPZ+ledqSQebGhM=
-=2k1R
+klBsFw//WaXtANGc5eNtHoU57nyWIBRHj7ILFUE4+k6Md5IqWUKhey8KXwxdrhoq
+e4opBX6EcumHl0qJwPu6ZfAiD7/Q47MdoTMZSRj2bHwpOPb9Cm1TLYQlZqS/akK1
+4H1yd6Yfauy79UEuwjDSOKryWpcU6pSGvB1O6YtUwkFTrvl7SPseS864k+pqAb7N
+30/l821z2Tk2cs/bdkN8zaH5lxUwJKGfyAGwkQcQjMq8qy27D9/YTOKTwCrRVlxB
+2mTyqce67STa2gNs4MJZ283IQmrm/QX5OIdGAj5CcDuWcb+nF6VgC52Bjr4joLPc
+6eRHikhLNrH+PNztoWAPY3rmhSTcHHt1bAyGKVkX+Mwk26M5bzTWFvMKvBbbjuQr
+wjafPzKVxcvySK1E7BRIpEKbI3kIvLQK4Z6Ts8299f2gIbTTyTOIpy6ikwlQhauQ
+KJTMuehUpMP3s+dmhX0GYkT86fpkC/Ew8Z0Q2SL6C/fIGSDCXsR0BsNQXqdKXU+x
+OttL9+x20VZ+GxqM3S5uq5xYbPE3Ndo0d8vJ+sqNOVY7x0/JGHfdGu6tuQ8Dhd37
+lyprPEo/gNXx/aY24XP+KxMBJJoHqoXvBaddj5lYUdmO7xq9nMrhUHQ53fSFgbad
+I4qb2+FYtWuc7j5p1S2oxh1poSh25EXHislGCjiTHm1zYAJt3CY=
+=HkM1
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 9b5f0a3e81ee..ddba0fd1128f 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 9e821d9faec9..a5735d2eae94 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 8ecb66977ddf..a475a6df5996 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -2,4 +2,4 @@ AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d9
 DIST calamares-3.2.32.1.tar.gz 3425260 BLAKE2B e10174d400a402cfe3d7a015f4fe7a02ad1653e5a4cdf65c31360467e3b3ff10629d991dd206424d51c67533f8ab550e09e74b4334dbebe9e5fec1a06ed0dbd4 SHA512 30e523dd3c340f9c4385a53a4011ed0f16e317572fa2e5b6acfe638aaf029538f0ab85924999e9683ba10014be99b3c35ff3234bc85cefa2ccd14e2715c87222
 EBUILD calamares-3.2.32.1.ebuild 2181 BLAKE2B b371e28a165c6c80dee19e5b8e4076bcd70e399d76b43b8210dfe69aa6d6c1f29d48f858594482dbb1ea28c0d19571da907f22a082966d3fd9e0333431daa19f SHA512 484a41c3789eceac69e3aeaa1882a6585ce060411522f7a8d6f2604301d7b4c37636eb015bc6ca1e3383c044a9bcc9f77ffa12c64551f5af39978b96b44d0ca6
 EBUILD files/calamares-3.2.32.1-remove-broken-tests.ebuild 1682 BLAKE2B 1d41c22b99797d41066e55b21bd5b9957411c210be3d1a8c01470694211387aa7e8b931d5499143d7d2747657625ac1c3db17d67bac9f741aada25fde93f517a SHA512 1c4a5a2d8b6c96299f45d3ef7581dfdca81c0854c9c746e6636a07101fb4e0d05809a4d64d826180599969c6fe398175dc7f5322ab52ff6c61dac4925919f275
-MISC metadata.xml 970 BLAKE2B fc958c25bf44e37c32da53c4fe0bfabc0e2ba8ef6213f8c3b3d95a685c8f7bfb6806ab06719ea5b39f94800c03f9f3ef211408ad57f58f60d0d09e5fbb823c12 SHA512 b5ca20e1baddb3f7cb4f704d9becbb7163cdc90be23145367d0787cfa1f55a54f5740e4bb57231dbd4ced0a23406341a89e00cf03cee21808c5c26a1ead35712
+MISC metadata.xml 858 BLAKE2B b66d7a5fa62cc1a83bba80a4d166e3985fb0bae043b5fbf03328e2c838543ae072322aa376751da8ee3912e8c8cdfb9e5aec8ee4700346543464a117d57933f9 SHA512 b333853647f132719762811ecf38e8a9dd3794dee3b944d3771204849f8ebe60f179759c5c9bfed4ed358174921c16b45c175a7598074814342225134f0bb700
diff --git a/app-admin/calamares/metadata.xml b/app-admin/calamares/metadata.xml
index 8c2f79648746..f28035634d1a 100644
--- a/app-admin/calamares/metadata.xml
+++ b/app-admin/calamares/metadata.xml
@@ -5,10 +5,6 @@
 		<email>johu@gentoo.org</email>
 		<name>Johannes Huber</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>mudler@gentoo.org</email>
-		<name>Ettore Di Giacinto</name>
-	</maintainer>
 	<longdescription>
 		Calamares is a distribution-independent system installer, with an
 		advanced partitioning feature for both manual and automated
diff --git a/app-admin/doctl/Manifest b/app-admin/doctl/Manifest
new file mode 100644
index 000000000000..334772578b82
--- /dev/null
+++ b/app-admin/doctl/Manifest
@@ -0,0 +1,4 @@
+DIST doctl-1.55.0.tar.gz 5157504 BLAKE2B 1d3db2ee4ca71a459456e72f035648c5ba73c5372c3369b360e1ee3cc44ec1155295e5f425611c307371f902c7ffed7dbce2f959266f79ecb8f149144fc86596 SHA512 6cea86e184ea25d5a6740d4090148fbe053ce93ebe8f2344f5a2bf62283381ed2a9574862a5ba39f34a52bf85af550313b7dd316a321f31089673f898d37cf78
+EBUILD doctl-1.55.0.ebuild 1052 BLAKE2B 35c7455909cd2473f76475f8018a70f04d39797144dd066317c5169dddda96eff650360ed81bebe770afbfd65f35c72300200b7f87ac4a468a38891861f46dc9 SHA512 a1c6467a53f6367e2ae79c77777fa56f12d9b215b51043adc5729ee4dfb2fdcf00657af4616c0d4a0b28ad6e9652b5ddb3cc0a3a0c4807261d550a3130920de9
+EBUILD doctl-9999.ebuild 1070 BLAKE2B 7d2dc8ba1e8eeeaab13f95daa8ab64cbbe3e87e1467684696c51db6f59a9b61570aeb2475d3012218c0bea8710f01e80871f80cca7ec9cd0df8d363bfd03cbbf SHA512 9bcf8071bb9e09cc032bd3ef850899f208dd68d715fcdaeffdc9f8248289031af7942d16c9ec30d9aa3197c03db0c02f5898be50fe04418e39055ae024106642
+MISC metadata.xml 639 BLAKE2B f0d6454d5d90aca55ca539f51583c08c1a6dec8bf79586ce2bdf3140c8fedc20fd22da3db92565c856f507e983de12de6c798bd8116d998f43b06857b1c77a24 SHA512 c21ed1e14490427fb76174e8182bc2b960ea60aafe5f5218eebdb06d04a51497f18cc00e5ea264181440ca80e765f9856c362c0bf01e31531ca8980f5db074b7
diff --git a/app-admin/doctl/doctl-1.55.0.ebuild b/app-admin/doctl/doctl-1.55.0.ebuild
new file mode 100644
index 000000000000..8241168248ab
--- /dev/null
+++ b/app-admin/doctl/doctl-1.55.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="A command line tool for DigitalOcean services"
+HOMEPAGE="https://github.com/digitalocean/doctl"
+SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_compile() {
+	GOFLAGS="-v -x -mod=vendor" \
+		go build ./cmd/... || die "build failed"
+
+	./doctl completion bash > doctl.bash || die "completion for bash failed"
+	./doctl completion zsh > doctl.zsh || die "completion for sh failed"
+	./doctl completion fish > doctl.fish || die "completion for fish failed"
+}
+
+src_test() {
+	GOFLAGS="-v -x -mod=vendor" \
+		go test -work ./do/... ./pkg/... . || die "test failed"
+}
+
+src_install() {
+	einstalldocs
+	dobin doctl
+
+	newbashcomp doctl.bash doctl
+	insinto /usr/share/zsh/site-functions
+	newins doctl.zsh _doctl
+	insinto /usr/share/fish/completion
+	newins doctl.fish doctl
+}
diff --git a/app-admin/doctl/doctl-9999.ebuild b/app-admin/doctl/doctl-9999.ebuild
new file mode 100644
index 000000000000..59e3c4d9aa3c
--- /dev/null
+++ b/app-admin/doctl/doctl-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/digitalocean/${PN}.git"
+
+inherit bash-completion-r1 git-r3 go-module
+
+DESCRIPTION="A command line tool for DigitalOcean services"
+HOMEPAGE="https://github.com/digitalocean/doctl"
+SRC_URI=""
+
+LICENSE="Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+src_unpack() {
+	git-r3_src_unpack
+}
+
+src_compile() {
+	GOFLAGS="-v -x -mod=vendor" \
+		go build ./cmd/... || die "build failed"
+
+	./doctl completion bash > doctl.bash || die "completion for bash failed"
+	./doctl completion zsh > doctl.zsh || die "completion for sh failed"
+	./doctl completion fish > doctl.fish || die "completion for fish failed"
+}
+
+src_test() {
+	GOFLAGS="-v -x -mod=vendor" \
+		go test -work ./do/... ./pkg/... . || die "test failed"
+}
+
+src_install() {
+	einstalldocs
+	dobin doctl
+
+	newbashcomp doctl.bash doctl
+	insinto /usr/share/zsh/site-functions
+	newins doctl.zsh _doctl
+	insinto /usr/share/fish/completion
+	newins doctl.fish doctl
+}
diff --git a/app-admin/doctl/metadata.xml b/app-admin/doctl/metadata.xml
new file mode 100644
index 000000000000..02d7430b53ae
--- /dev/null
+++ b/app-admin/doctl/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>spiderx@spiderx.dp.ua</email>
+		<name>Vladimir Pavljuchenkov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+	The official DigitalOcean command-line client,
+	which leverages the DigitalOcean API to provide access
+	to DigitalOcean services.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">digitalocean/doctl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/newsyslog/Manifest b/app-admin/newsyslog/Manifest
index a170eab95185..833b9d92b699 100644
--- a/app-admin/newsyslog/Manifest
+++ b/app-admin/newsyslog/Manifest
@@ -4,5 +4,5 @@ AUX newsyslog-1.1.0.81-html.patch 428 BLAKE2B f0861cb97bba4cc1a17983a1dbaac22381
 DIST newsyslog-1.1.0.81.tar.gz 174411 BLAKE2B d7916396ecf7dda9928891c3bd1020be45354c9623e53d9a52170567c811b3cad3e82efec8145f51a68ed851c46a6c3fb6e8bf944bedf935f2a6589e4b45d3e1 SHA512 de7ae2f71fb5a2a3fad0eaaa793da1ff2b36bc5757a30c70e8f740da8ea2647aea0422c13c1cc1a5e082e41938cbb590c8bb0ecf46d5d584466069f319db47c2
 DIST newsyslog-1.1.tar.gz 156371 BLAKE2B f9ac2de3059e377e61963af70591ca19bc335ffc96d1aa94770fec96cad7b8200d10edc6ac4ab115b697eb0527a998dd457ea1c0d5a1b529d5cbf5285d5ec138 SHA512 b321ae47ecacf6905858bedfaa5ca8c4230f7b6e5a715f8481331940c0ae53795769524a62d1670b4df27f9e263b407be83527a64ccd54b3ba75d55d3c5149b1
 EBUILD newsyslog-1.1-r1.ebuild 931 BLAKE2B b6f08d32e6a4a55007817fd7c90526328a1273e751bb063462d93fe82f6d05221fd3221c290167b91a88e03c148067caef442634646e08587403a80d59e9e5a7 SHA512 64a6bbbccb5b1487527e5511deb52f07647aac7e90d5a4b6caf095a21b705441ec4f22b94051809eb738cfec9009104b108f950ee66fb7b1f1e8d5400b84737a
-EBUILD newsyslog-1.1.0.81-r1.ebuild 1015 BLAKE2B 7f13bb3d0d874fc25caf54525ae61ae8fa8f8f3fb3a983b47aca9e1be9ce6c14a4a46bd96f83f8def19b608bbc360aceb21e33583fb56a0d00bfa9dd9a9a1eb9 SHA512 35f7c120a7c9c4bcee5e8cd98021735a2e8c839534a62fbda9ac9184537e493f4e66ef3dd10d29d8853ab2061f061815a0b7a1537d97eaac14bd5e83b35bb49c
+EBUILD newsyslog-1.1.0.81-r1.ebuild 1014 BLAKE2B 215d8b9b2967245609dea3d3ce692e8f554ec79cf1a14258f0f40ff8b00277fb444392bb8288a5ca3d723669a96926321724e5948ca63cc0f416df43dbe4a957 SHA512 8fb8296e82fa1c37aea0f6687cb4db5dfd05062c1a6596f542f919745bfe209df65a401086f02164f5c1bf93254b746f35ed6f8bcc3eab7dade63821bcd31c37
 MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
diff --git a/app-admin/newsyslog/newsyslog-1.1.0.81-r1.ebuild b/app-admin/newsyslog/newsyslog-1.1.0.81-r1.ebuild
index 3fb7cf3ec3a6..6b63b61cb7a1 100644
--- a/app-admin/newsyslog/newsyslog-1.1.0.81-r1.ebuild
+++ b/app-admin/newsyslog/newsyslog-1.1.0.81-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://download.openpkg.org/components/cache/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 BDEPEND="sys-apps/groff"
 RDEPEND="
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index d08d1236c374..87b72fbbe9ac 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index 541bfe38d75e..803ced4af60b 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -1,6 +1,6 @@
 DIST libmd-1.0.1.tar.xz 257372 BLAKE2B e954ab6b1247952abcf6964d8d714c2a47a644e206a455db547a0159a97ebbc323cf1258a24c744cea3106f267f1a319a689fe545b672580f4e134d96cc7cb3d SHA512 6f343101f9ad8f927d862e6bae948d35ba596ecfd375c255fefb86efc621cf6e9de3597770ad66e0a48e8f4ea018df78debb571ea6746a7457d8900fec87069b
 DIST libmd-1.0.3.tar.xz 258584 BLAKE2B 35b732800a4b0a7b8d0a88eeff5e7e80fe55ab5ed05b7a7a1ffe866e156cc6dc6daca95f865a56297857b10b1bdfc9815b5bf0b198e8284f217498265c08fcc9 SHA512 f4b5a86bea7b9fac9f7f173032ee436d1e7141f760c1a114a785d31644edbf6802fe8193cc4cf3b5c66d38963be919c05055780bdf6bf5a47927690490ff5966
 EBUILD libmd-1.0.1.ebuild 655 BLAKE2B 277dab7e12e30f7d570cdad5f044efddb604d718d60bfddebdeb2da857b518cafaff7a3174e924ea073e666cad7ffdf6346a9a23caa73e2ddcb188810f8037a7 SHA512 c40343fc729bd8f3f2a4f793f627d970e2b5859bbb74fe9d59cd93982c886a0342fc4142f8f213173ee422f302b9c95670a6b25c5ced1698c2bd62c4b098a2bf
-EBUILD libmd-1.0.3.ebuild 591 BLAKE2B 35c36ea274fd91148976f8b116cb805a9d13c7e934843f50397981d260d3d67df49bbfd7d0df48a64447d32370d70e6aa22fe2ed05e8f34418bc059281c13fa6 SHA512 a3faf8a16e63b97c637371e128975f4bf06f6ec9eaee5851e6c91231e93d0f6be74ac07a04e19e28df34b95f6ae211fd97d2f38d5f5a6fd549fd7596d91ea754
+EBUILD libmd-1.0.3.ebuild 590 BLAKE2B 930433bb6705e30b2111200a4a231295536d0b10d6182bb543a990f451e0353b987d800c07a704a24011570fc26c833fa6b777e33b39cec220342375d2d913a1 SHA512 9ae9167cb185813004fcc52768c104f5953e9384abc4aab1d8479f76436a37da718a70bf8b9004e0c66b06e53116042167197831d88508c934e1c9c1ae01973f
 EBUILD libmd-99999.ebuild 568 BLAKE2B f3e942f902160f0fbf840e0c082a3dd07f57c2fe1a9d785a5d7b26c429f2baf6be48e4420b65d3c6b9b15684d6043576e989b15d188a167b016f8d404669d59f SHA512 d8479e0df2f68c33deece78037021a2dd26d75ed623b3fc486837b6bb53bd33fb49d4401e9dc5f938f161a296adeb2e7da8ca6294aaed56b8f9e8adf2fb2f759
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/libmd/libmd-1.0.3.ebuild b/app-crypt/libmd/libmd-1.0.3.ebuild
index 55fdb75b7caf..6b33c5364c47 100644
--- a/app-crypt/libmd/libmd-1.0.3.ebuild
+++ b/app-crypt/libmd/libmd-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
 
 LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	econf --disable-static
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index fd359058f008..b77caacb8936 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index b9ef59106cb1..6d227614828d 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,3 +1,5 @@
 DIST okteta-0.26.4.tar.xz 969572 BLAKE2B 37f3a0c83c3a922030816813de9a66edff0f4a1ae9f3450f9fe195b52d1b053c23f37c8fb2a06b08ef8df47061123536f202809b3d4954d824103dfb1b912559 SHA512 2410fc73d2685405cef7d3d639ae202632f8781885803aed5e2e5e4ff8b48f7cdf4f8b9565edbc1b5fa3db4bb22ae90019f8cfdf4bda09def7badc559ebe02a7
+DIST okteta-0.26.5.tar.xz 971940 BLAKE2B 44313d9603b15e9b9c4355b34d3d3b778c6530de7bfb2ab2589716c5123a5c66116d1cc8aa8197fb55135fb4dd6eca89155ec3c5f18b14e5f88c664f2197de4b SHA512 9a4934f8f4508bd858f8ed13f02174b211453ec5b38aa0fcc62d1173e3a0e0101754d23f53ce4bddcfe9106eeaed687f1141d2a1a65efc3ea8478e5d1840dc09
 EBUILD okteta-0.26.4.ebuild 1748 BLAKE2B 2dde9f4114d76cf744609ee57879ddcf4a4d1a7cddba1ee11a954c4bab2f07d8abf36970c333c24e9db73281bb764210cbfda67bdc1787bbfc4be3a1347258b1 SHA512 843900a57980eddaa49d34ab1912b34868a0020e5d4243aa2247fda2883128336a7cbb037b755164200cf53843b6221f8512c5108e38873e178021038427917f
+EBUILD okteta-0.26.5.ebuild 1750 BLAKE2B 74155ad1b5f24168a1dc0c7d22a70d08eae09d30b236bda0f6c29c420384c2a4d958413807ad5c511cfde3829f6504f6ee3701cf4f3d083a8c104e368508c90e SHA512 a0ffbe6000332e69ef8d1f36c2865c573573cb4e1ce71138a6618361a0e49e0039f0c96a6f70d844ffa7651cc21cd2a31772390c1fa95af4e5869ac35453335b
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/app-editors/okteta/okteta-0.26.5.ebuild b/app-editors/okteta/okteta-0.26.5.ebuild
new file mode 100644
index 000000000000..fbd056737062
--- /dev/null
+++ b/app-editors/okteta/okteta-0.26.5.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.74.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Hex editor by KDE"
+HOMEPAGE="https://apps.kde.org/en/okteta
+https://utils.kde.org/projects/okteta/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2 handbook? ( FDL-1.2 )"
+SLOT="5"
+IUSE="crypt"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5[scripttools]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	crypt? ( >=app-crypt/qca-2.3.0:2 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOMIT_EXAMPLES=ON
+		$(cmake_use_find_package crypt Qca-qt5)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	local myctestargs=( -j1 )
+
+	ecm_src_test
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 650900e29506..84c960f5b907 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/genymotion-bin/Manifest b/app-emulation/genymotion-bin/Manifest
index 9c0b57eba901..e537eaee8f3b 100644
--- a/app-emulation/genymotion-bin/Manifest
+++ b/app-emulation/genymotion-bin/Manifest
@@ -1,3 +1,3 @@
 DIST genymotion-3.1.2-linux_x64.bin 40553630 BLAKE2B fd11ad2a190788758cc84d8be7774aabcd3e21a7cfda05948ed2bd09fae9834489ab69a6f834ef700ae283899185ef2c9f2371b7a0549327f95fb83701e4f29e SHA512 068f491965edf0d455676aa1903ef7df427986d750efc80e691ca68f7c4908101de782c71dbefc6dd53d2c8344b5b7fbd0e4c8f2fa5f3e2944d6c558627c2dc3
 EBUILD genymotion-bin-3.1.2.ebuild 3592 BLAKE2B 86cf768889157d29282a787c244d2819f83c18969f127ade68556be74a61e965ee1643fe7868cd46637d77009f9bb1104798e27ac095d29446a0129569232d07 SHA512 4094ee96e501dad45c108b1e8b74e3f91e9fe307d2074cff99aba46705c7a07a216bbd687f59ff5ce2c43f5064178a555332d2e5acfeeea2bebfe7cf2f13666e
-MISC metadata.xml 483 BLAKE2B 1ed85dae79388f3c548163e5fafd2838e1adf9bfc9a9c793ce7f9e7e323f8e3c9e7e2f3190b3ec54a0c598d048c61b6ad67c8eefb3845cd446ea67b01e0df8a8 SHA512 e88ad9fd8c20d5be5569c64544c3f4dd72eb3243d46333c30aaa1b939eb6ce35855aa3e771008b2fff990de5b2e5bf79ca378714e3cf7dc375144b7cd8f5649c
+MISC metadata.xml 371 BLAKE2B d19be76b4ad2e2001f890c52fa894b50dd3fb63de95eb8b1a36666efe3e087c4c66d33a4d9d369f1ef3bbbc9be59648d91859448da8cca1397da8dcaf8efc1fc SHA512 5ffa59cea45522f04e42a63fb486e8584f30d07ce5ab9c9d875cc7342d1ff99665db25585d924b3f5e25eff42e54c55a3e970cd9b88b32a1112066d9a8c214d8
diff --git a/app-emulation/genymotion-bin/metadata.xml b/app-emulation/genymotion-bin/metadata.xml
index 0a47874eaf48..cc2aa77ecc42 100644
--- a/app-emulation/genymotion-bin/metadata.xml
+++ b/app-emulation/genymotion-bin/metadata.xml
@@ -5,10 +5,6 @@
 		<email>fedeliallalinea@gmail.com</email>
 		<name>Marco Genasci</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>mudler@gentoo.org</email>
-		<name>Ettore Di Giacinto</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 80e1a319686f..fabbe5d5c4a6 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -9,6 +9,7 @@ AUX qemu-5.1.0-usb-oob-CVE-2020-14364.patch 3210 BLAKE2B f812f4bb18e540ebafeb9bf
 AUX qemu-5.2.0-cleaner-werror.patch 884 BLAKE2B 95404f78f5559f5725c1978e7ef619675817bbe308cd636d6cd9fc43c5ed7440d826c4cb89165fbb275dae3840026b6391e8040b0d21d65120c34b7e41f844e7 SHA512 bdaf7c433c0f10a3666b4f06b680122e4a9bcf41382e50b3f3cb7b236134860ce91864d305282707068763f1521d61d47277579acdf778d6bd4312884eb04d43
 AUX qemu-5.2.0-disable-keymap.patch 884 BLAKE2B dbbe245a52615f8894cbac1c94ce3fee2051b1c54def32ec6ad43dedfe8190d02937c28ce93d93eeb13fe82f2ac2df52bec375501e83af53624d8292f8208fe3 SHA512 f84c6f37ce742201b63b308bef5fdaf1dc50e77e0dcf164e85284e338ed7bd861fc0e147fb88668b056ab0f15b4e6cbefbfb2cd2bafeb002c281ae88d08f9703
 AUX qemu-5.2.0-fix-firmware-path.patch 596 BLAKE2B f46890eaa22ac7f94725f5dec86ccabe78f002ef6e4ce6b8f3323362203783ae65f77442634520863abc7a5ed91639c6284ccb53f0ed4f87523c7e45e4a0f186 SHA512 9fe5ed5b72098b0c5b9f9b6ae371ac745de9e269f3713b47ac2bd13d2f03f0827128d43757876f83eeb770dbeeade32db5f10bc9f58d02ed929a45caa5f558ac
+AUX qemu-5.2.0-no-pie-ld.patch 2929 BLAKE2B 07126013ba465c30fe9ddc8e690e1906d5fa187cf47adcfe94177fe46e6a0365622e938090b23b5517df9e78aa211f4b014939e50503ba8bc09afca5794479ca SHA512 d6cecad4d98fad469dd8514e02372053a99d8077aa4348a36609cf459d7dffa962df937fe0350540ecae4beb274dc1b3c72bce34145474491156ff564104532f
 AUX qemu-5.2.0-strings.patch 799 BLAKE2B 8f249a647714a4a677d1aca5d8d5c19b27a0e1933877a286017928e01ec23d82e41dc1d196a50ba38bcf4ec8b71fd89c89e41b7c9673faf13935188eebaf4a56 SHA512 481917c8ec9c5089c210f80e719f5a65af1193323ccda4d68bec6afaab0d0e6407cee1d05cd1f3b1bfbd7b7a5f9d2cdb42dd12123813f2c3c51116e999c09288
 AUX qemu-9999-fix-firmware-path.patch 672 BLAKE2B 68849de377ed0134269b89fb3cb896fa42da75aa99aecfed75283b78073fed43dfbafb8bd9c3c0545ebcd943fe86410171f9933965646bb0f2ed901a0720bc6d SHA512 604e6865d206536287f7690179bf7c369e83646742feb9af2a1b46be809c19754e22c2bec430f35cf2e3ef0fc4929541e140d15ddff4a9579db5cf18a3bab1f7
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
@@ -17,6 +18,6 @@ DIST qemu-5.1.0.tar.xz 62911540 BLAKE2B 6a3ecbda2d9274f2736ffbc88d2006be31f153e7
 DIST qemu-5.2.0.tar.xz 106902800 BLAKE2B 4413d5591cbabf80faba5b0b7347ee7749ff0a71af44bdf7f64b1995e17ecf1f3df539fa8e63959e0d50cd0502a41a2921e60cc6d078ed8ab5b09ab4b86d4ed7 SHA512 bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3
 EBUILD qemu-5.1.0-r3.ebuild 25432 BLAKE2B f12769a35b050372341beb39b8ec82c9ce7527c54d570ef612af433fbc7e75f9adacca8d6ab42aca68ff5abb58a67b3dea5f2d2204a78c4fb6052c1df897e9b6 SHA512 268ea9f2be68b022b93177e795f4ef7b6955f9cacd6185a9730e76ee2ef771902316d659f73c3de5bace9290c7e75f7fe9933f12e06d779f58c54883a5c94d06
 EBUILD qemu-5.2.0-r1.ebuild 25166 BLAKE2B 490ee1d912eae15de8acb4b121db0ecf3841be870f27f96b332ec96e25ab6fb8a8160a991faf1b55fd32423c65e1fe27d0c4279ae067119baf0926257229800c SHA512 4338db442a55540c84007b1c19b55533bc29437e5a5c47593abb1e8ae686125feeaacc217efbc6e9d76fea537440e7e5d5419a779ac2ecc5c8b55b6edce96019
-EBUILD qemu-5.2.0-r2.ebuild 25220 BLAKE2B ea28731e9ccf0609ec71ee4a833c7ee6edeb601d48ef6703c7583c89e4a6aa985fcc1f474eacd1747e4677c22f743ac729fa16ad5ee9f26eff48fcb515d70506 SHA512 1683b1690757c5d6af8f71636b6b918b09b09fb0b35aaf2be51df9314e1413351c35cf76d7b11a253021a5a62fab475e7b0dcd03f9225a54bd1b8a4e29c70119
+EBUILD qemu-5.2.0-r2.ebuild 25263 BLAKE2B 489281f338d00e54482eaadf70e7297f7be9f992e28c3089fb1dede27ac7143f65148f6bc7acc961457688d484097e4feba12c061f5138f6018498eab84d6c4d SHA512 a312925d1b50023a7ebb6ed9a0ffac53fec063ea738023e9127f4b066388cd19c34b3562103c2d1d7daaf8948685bca86deb99faee0903ff06dacff22b6e8eb3
 EBUILD qemu-9999.ebuild 25219 BLAKE2B cf860af6fc19de8230075596e91db75acea37788d609b63c94b1b3a330f332c92b510276e38f0acc26892446fcb16ebaf4f7e0bd466e994d8dc7e7801349a3dd SHA512 67a85a3223c5642f714ac12c6672054d2dde53fbe08d715f01cc5f2d3660a9ff9d2f0acc94b88f04b3a6a9ae74046954beede5b04aa8ce78f411025949af732e
 MISC metadata.xml 4458 BLAKE2B 521a9c7b7c3371ca4352decbaf2324ef22822a176bf22b4f26761dfc40535cb4a6d6438f39ae6803804fdac8891bd2ded0f972279eec9076b80803826946f954 SHA512 9ba9e2805b6fa423fad3da849f57fdc328e8d6276a0a3d15a8970fc117d8174a76a20be96cf9eaa2a92149de922aa0c9b807cd4f2412f335375088dc32a79b61
diff --git a/app-emulation/qemu/files/qemu-5.2.0-no-pie-ld.patch b/app-emulation/qemu/files/qemu-5.2.0-no-pie-ld.patch
new file mode 100644
index 000000000000..f47a58790cc1
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-5.2.0-no-pie-ld.patch
@@ -0,0 +1,73 @@
+From bbd2d5a8120771ec59b86a80a1f51884e0a26e53 Mon Sep 17 00:00:00 2001
+From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Date: Mon, 14 Dec 2020 16:09:38 +0100
+Subject: [PATCH] build: -no-pie is no functional linker flag
+
+Recent binutils changes dropping unsupported options [1] caused a build
+issue in regard to the optionroms.
+
+  ld -m elf_i386 -T /<<PKGBUILDDIR>>/pc-bios/optionrom//flat.lds -no-pie \
+    -s -o multiboot.img multiboot.o
+  ld.bfd: Error: unable to disambiguate: -no-pie (did you mean --no-pie ?)
+
+This isn't really a regression in ld.bfd, filing the bug upstream
+revealed that this never worked as a ld flag [2] - in fact it seems we
+were by accident setting --nmagic).
+
+Since it never had the wanted effect this usage of LDFLAGS_NOPIE, should be
+droppable without any effect. This also is the only use-case of LDFLAGS_NOPIE
+in .mak, therefore we can also remove it from being added there.
+
+[1]: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=983d925d
+[2]: https://sourceware.org/bugzilla/show_bug.cgi?id=27050#c5
+
+Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Message-Id: <20201214150938.1297512-1-christian.ehrhardt@canonical.com>
+Cc: qemu-stable@nongnu.org
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+---
+ configure                  | 3 ---
+ pc-bios/optionrom/Makefile | 1 -
+ 2 files changed, 4 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -2137,7 +2137,6 @@ EOF
+ # Check we support --no-pie first; we will need this for building ROMs.
+ if compile_prog "-Werror -fno-pie" "-no-pie"; then
+   CFLAGS_NOPIE="-fno-pie"
+-  LDFLAGS_NOPIE="-no-pie"
+ fi
+ 
+ if test "$static" = "yes"; then
+@@ -2153,7 +2152,6 @@ if test "$static" = "yes"; then
+   fi
+ elif test "$pie" = "no"; then
+   CONFIGURE_CFLAGS="$CFLAGS_NOPIE $CONFIGURE_CFLAGS"
+-  CONFIGURE_LDFLAGS="$LDFLAGS_NOPIE $CONFIGURE_LDFLAGS"
+ elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then
+   CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS"
+   CONFIGURE_LDFLAGS="-pie $CONFIGURE_LDFLAGS"
+@@ -6714,7 +6712,6 @@ echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak
+ echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak
+ echo "GLIB_LIBS=$glib_libs" >> $config_host_mak
+ echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak
+-echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak
+ echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak
+ echo "EXESUF=$EXESUF" >> $config_host_mak
+ echo "HOST_DSOSUF=$HOST_DSOSUF" >> $config_host_mak
+diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
+index 084fc10f05..30771f8d17 100644
+--- a/pc-bios/optionrom/Makefile
++++ b/pc-bios/optionrom/Makefile
+@@ -41,7 +41,6 @@ override CFLAGS += $(call cc-option, $(Wa)-32)
+ 
+ LD_I386_EMULATION ?= elf_i386
+ override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds
+-override LDFLAGS += $(LDFLAGS_NOPIE)
+ 
+ all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin
+ 
+-- 
+2.30.0
+
diff --git a/app-emulation/qemu/qemu-5.2.0-r2.ebuild b/app-emulation/qemu/qemu-5.2.0-r2.ebuild
index 90d6bcb7da44..f412ab52cd54 100644
--- a/app-emulation/qemu/qemu-5.2.0-r2.ebuild
+++ b/app-emulation/qemu/qemu-5.2.0-r2.ebuild
@@ -229,6 +229,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
 	"${FILESDIR}"/${PN}-5.2.0-strings.patch
 	"${FILESDIR}"/${PN}-5.2.0-fix-firmware-path.patch
+	"${FILESDIR}"/${PN}-5.2.0-no-pie-ld.patch
 )
 
 QA_PREBUILT="
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index 3747e2329a2a..f2f363700b6b 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -8,7 +8,9 @@ DIST pciutils-2.2.9.tar.bz2 212265 BLAKE2B 014b664e90c64e7255c9e21fc25a2cc60d57f
 DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c907c3c6b352eed3d9e500fc5739e62eb4f6fc32ff02579c6a6de9bd49fcd2c8bd8b2d158a5050cbaa82118d61ef0 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad
 DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
 DIST xen-4.14.0.tar.gz 39950576 BLAKE2B db4c3e79cfdfb10260d0d14d9d28e8c8bd9bf23f42aee743acf8f560bf4cdb96a425c0df887c70f9755f62680be24bfbe0149e52a4cb843ae83090cd9d6afc71 SHA512 ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0
+DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9
 DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
 EBUILD xen-pvgrub-4.13.2.ebuild 4527 BLAKE2B d15b849b72dc8758ee7253c2a12e24c43faad900047051cee89b6c1c51933a571430d7d9b2b50d7828f6425db16a0e1878939943f74d79f407667aed4650abe5 SHA512 2006e7c6c574cd0ba09a0c460f4469f9a3379488aaf9f54672bf67c1b6159aaeb752f06af9c57af7b69fa02b20b28fff9bc6a0688cc0d23ce1a3a8116ba5ca44
 EBUILD xen-pvgrub-4.14.0.ebuild 4530 BLAKE2B e8e1e6a46a090cb50814c9f3647bb5e7032863391a2b54dd0b610dcc9d3882f0f991ad426559f1e0472f74c55ce050d71a11092daff0e8fc2751e1ef2c97ae76 SHA512 9069a35ad4100f96a15e71034a8c86ad76d3f7c43e5068bc05f9fd903f0df9ba6d6b984d4291b3eb5cf3a34f172eedbaaa7fa91e5734dcdea3e04a9c6f336f02
+EBUILD xen-pvgrub-4.14.1.ebuild 4530 BLAKE2B ef74a5ed5ffe009f105e48b1b19193a8ae6f115ffe665940fa9e0de29d46465675b242b6154945a10dbb5d0a89c0266adaf9f577ad74e42cad58eeff25a17b6c SHA512 44f97e79d3e13e6860f1b3ae8d504a76cdcbba744b20159592bd6721266d0d4325a88f9fb5d506f91b6c2ddee94b5f10198e18c65078f24b395f51cccdfb456e
 MISC metadata.xml 477 BLAKE2B 663101aa83713fa70e98a41985f3ec3d4c78765b862fb9df1f35ed31d1b32640bc093a0d680252d7b0116eca7f758145bb6337618ac4fea8a0ed108df83ca57a SHA512 907e17ebf2262b71644a8b2d863f5d4cdaee775026eb1a9da736a4ef003a45e8c6eaa2439184865706e57aea0afdf5f3f363e98dc63762ea8706ffad640c9046
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild
new file mode 100644
index 000000000000..c3980e0437ec
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='xml,threads(+)'
+
+inherit flag-o-matic multilib python-single-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+
+UPSTREAM_VER=
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="
+		https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+		$GRUB_URL/grub-0.97.tar.gz
+		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
+		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
+		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
+		${UPSTREAM_PATCHSET_URI}"
+
+S="${WORKDIR}/xen-${MY_PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="sys-devel/gettext
+	sys-devel/bin86
+	sys-apps/texinfo
+	x11-libs/pixman"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-emulation/xen-tools-${PV}"
+
+# python2 only
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+retar-externals() {
+	# Purely to unclutter src_prepare
+	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
+
+	# eapply can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
+	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
+		-i "${WORKDIR}"/zlib-1.2.3/configure || die
+	sed -e 's:^AR=ar rc:AR=ar:' \
+		-e s':$(AR) $@:$(AR) rc $@:' \
+		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} || die
+	einfo "zlib Makefile edited"
+
+	cd "${WORKDIR}" || die
+	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz || die
+	tar czp grub-0.97 -f grub-0.97.tar.gz || die
+	tar czp lwip -f lwip-1.3.0.tar.gz || die
+	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz || die
+	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz || die
+	mv $set "${S}"/stubdom/ || die
+	einfo "tarballs moved to source"
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			eapply "${WORKDIR}"/patches-upstream
+	fi
+
+	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+	eapply "${FILESDIR}"/${PN/-pvgrub/}-4.10-externals.patch
+
+	# fix jobserver in Makefile
+	eapply "${FILESDIR}"/${PN}-4.8-jserver.patch
+
+	#Substitute for internal downloading. pciutils copied only due to the only .bz2
+	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+	retar-externals || die "re-tar procedure failed"
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/libs
+
+	if use x86; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+	elif use amd64; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+		if has_multilib_profile; then
+			multilib_toolchain_setup x86
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+		fi
+	fi
+}
+
+src_install() {
+	if use x86; then
+		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+	fi
+	if use amd64; then
+		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+		if has_multilib_profile; then
+			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+}
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index f136be4fc971..c8e359042851 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,4 +1,4 @@
-AUX gentoo-patches.conf 2263 BLAKE2B 046e6ad4d3734da5820784fd82fb0ce4d781a2f1be9bc970541bb865c5b2ce157e1dae13eed47be193fd5633bc2be8e5681fcdfc2f4aee66bcc5b4150b1d0120 SHA512 bb9835623a87a3679aca40dae9113ae3b9b36118fb616361e7c1f127242eff7c476155609c8e569976eb89f0f5a7d79692577685834462a372d61d916cce2710
+AUX gentoo-patches.conf 2421 BLAKE2B 773cdfe400d24cf1d5f67ca4ae374537795ec42dd764f1ba3aa4d0ed12a5f9e6425a53133f4f963d107d82b644eb99c91896bfe5e82bc910c82140305c6a661d SHA512 bf0b0d191e81be5f8665841e43be08c44b195eabd9ab9a37d7fa28a3f01b0091635f419508eb4c2674654e780850d44ea9ddb97f6f5e2ec503780a52eb3ae235
 AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68
 AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426
 AUX xen-watchdog.initd 181 BLAKE2B b8529db36016b6f71520c1e4119a2ea5c4d3f52f2c77ccb5603efb67bcdd88b8273a359f6ae0df61763ea31a50bd8a0be775df5aabbd17c90e7928c8ed5b7c0e SHA512 5f6da91c0067b93f1b9f1a2f181caf34034896944ab26f5820e860336e3b3159a65e8a7f39ea273927d64d58a2fe4d918d2c3234f2b03ab0770e0c15d6dfe84b
@@ -25,6 +25,7 @@ DIST xen-4.13.2-upstream-patches-2.tar.xz 58992 BLAKE2B 535d67ae6a30e23feb975172
 DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
 DIST xen-4.14.0-upstream-patches-6.tar.xz 119116 BLAKE2B e3a0f807182d32754c6ae2000324237117cfa66c4a43c27b583b6aef69a3889949779751b71a87b2538f679fb481e8a723433950c689f28a8c2e96278c1b0ddb SHA512 03b1fdc08e74756001fbb0de4e21297456f63615e6f63b8f360f8270ef85b0d50c3872be41cc26529ed0d91d82ffda2af53882b7c5233113f223a4ec813a0d5b
 DIST xen-4.14.0.tar.gz 39950576 BLAKE2B db4c3e79cfdfb10260d0d14d9d28e8c8bd9bf23f42aee743acf8f560bf4cdb96a425c0df887c70f9755f62680be24bfbe0149e52a4cb843ae83090cd9d6afc71 SHA512 ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0
+DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9
 DIST xen-gentoo-patches-21.tar.xz 18280 BLAKE2B 95446da72fc16cb82e4e51df8796c64db05a30894a351a98dbd6700ce354c34956ca09a1af98125a4e56c337936e8fae296d806519b8afa23a82b078aa0db8f1 SHA512 3cffac162606a09b10b47dca604f167897e6ac8d153411d3464ef29a7a4d46ac5b92340884cb21279cb2d053b131f1ea5cb2111e3e9a21b3298b5ab3320ee34d
 DIST xen-gentoo-patches-22.tar.xz 18764 BLAKE2B e0da49b39fbc6b689db47e40a4fbb4f6568644fe192b114cce01b0406cba4bf23339ad1bf39b972f895df004916827b6e774f97fc079aeb8ac436763efda5fc3 SHA512 5b7959af4ed30edd2526698ab60a86353e35d9dc48dc941b6df7659a7c4904260461e0decbd8d788542bd69384736f2175861d4943c3738618d20788b19ea9b1
 DIST xen-security-patches-28.tar.xz 1580 BLAKE2B c304894801b37259508582fc6947e26c0b8665e982d91de86c16efd5eaecd6c9bb19570534642d39e81175fe58baccf576990a481f40f8848692d3465ad17a85 SHA512 b442b5568e76e0f2a5cfc91063515b96347f8b30f6101a81536b78edecc400861fd99281e1994bc6626bff28ece3df8f8306575c8abbb2cddaf3a6d3542c0b2f
@@ -32,4 +33,5 @@ DIST xen-security-patches-29.tar.xz 1536 BLAKE2B 7723e9d971a2385f7a4a85dd63412af
 EBUILD xen-tools-4.13.2-r1.ebuild 16589 BLAKE2B a7c07df0a4f5701ea087c63a8fc84c2165917bf71010dc9ad8a0ed2e56f3e0bf68d316474a2f5c0cfb248cedf068ff4c25cdc6f455959f04f3bb404bd9c872d3 SHA512 496607f4494fc9e87d6ecf3c3d108919ba1f317fff0f1f4fe6648b5c0e0fbc6ca3d35e2890945d47615ef0a79176ca8e54f149b43f893919a48b67d193f5cd50
 EBUILD xen-tools-4.13.2-r2.ebuild 16589 BLAKE2B e0dcea110a807bd7c565b41c0d3a016a04b684dfecfa01870951ea606759fa067a3f7a78d655a5decda409f54663c722c499cd98753ba8b3210f5b87efd39731 SHA512 9673f9fa78c6860688213fd21fb015111b6c23f355f89f8f63d0076adde5e87c749f7a44d53323d2fa4894644b04cc069cfd3a949265efe82e0276ddf1abc609
 EBUILD xen-tools-4.14.0-r5.ebuild 16590 BLAKE2B 1c1a8cc19c95f62ba44d222d3fcaaccd2ea18aa932670f2eb666ec0738fd08f98625cd4c5fe3494d026fac9dd1da8c80b81387fd6d86ba61ac4e6de3dd2a3c7d SHA512 7fd7146455daff2de1fc079d087681c8813be78e9dddafa91186db8c26d60cd632fe4ebad393ca00bfa13f80411317af544562e75ad81ded268ef5d150558788
+EBUILD xen-tools-4.14.1.ebuild 16587 BLAKE2B 91b60db2a81fcdc88d2523bbfbf8a6125df1d66d2c12016bb48b71486946186ada12b2567f5c1d2b0f2576b3ea30bc8b439c7e7338ee15a1b482420103dac87d SHA512 237b5271694e0aa408f024de90d3672d24224d1a9e12fb779d7a820c1762579bb023543ffe3bcd27890edd71eb987a0f7b188ff2a16da2f10837261ff0ba56ff
 MISC metadata.xml 1596 BLAKE2B 049149106eb740b3ca38008d18431001f4cf27ef8ab4223cb78ba97e301292a13f39ea51c6064fb1e116404d9c52a61c0d42b921416d0a5fff0f7749e2ab4f59 SHA512 76830a62f4fe0d93df26372c67c2f1aca143e85227d86246e2c2e2aade6c0f64b62f7d7f7229612e65b5da82dd0401822317fe2607e14565a2eb9386c760fc80
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 23d836ed8d16..5cf7256c9135 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -92,3 +92,13 @@ ${_gx037}
 ${_gx053} ${_gx050} ${_gx052}
 ${_gx054} ${_gx056}
 "
+
+# xen-tools-4.14.1 patches set
+_gpv_xen_tools_4141_0="
+${_gx039}
+${_gx027}
+${_gx028} ${_gx029}
+${_gx037}
+${_gx053} ${_gx050} ${_gx052}
+${_gx054} ${_gx056}
+"
diff --git a/app-emulation/xen-tools/xen-tools-4.14.1.ebuild b/app-emulation/xen-tools/xen-tools-4.14.1.ebuild
new file mode 100644
index 000000000000..bade7dc64537
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.14.1.ebuild
@@ -0,0 +1,512 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='ncurses,xml,threads(+)'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=
+	SECURITY_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=22
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=
+
+	SEABIOS_VER="1.13.0"
+	EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151"
+	EDK2_OPENSSL_VERSION="1_1_1g"
+	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
+	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+	IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6"
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+	https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz
+	ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
+	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
+		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
+		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
+		https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README )
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	ipxe? ( rombios )
+	ovmf? ( hvm )
+	pygrub? ( python )
+	rombios? ( hvm )
+	system-ipxe? ( rombios )
+	?? ( ipxe system-ipxe )
+	?? ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	sys-apps/pciutils
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-misc/pax-utils
+	dev-lang/perl
+	>=sys-kernel/linux-headers-4.11
+	x11-libs/pixman
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+	')
+	x86? ( sys-devel/dev86
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		sys-power/iasl )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-power/iasl
+		system-seabios? ( sys-firmware/seabios )
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		')
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+	)
+	hvm? ( x11-base/xorg-proto )
+	qemu? (
+		app-arch/snappy:=
+		sdl? (
+			media-libs/libsdl[X]
+			media-libs/libsdl2[X]
+		)
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )
+	python? ( >=dev-lang/swig-4.0.0 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/hppa-firmware.img
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/elf2dmp
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-edid
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-keymap
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-pr-helper
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/s390-netboot.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	local i
+
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		eapply "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			eapply "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			eapply "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf || die
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			eapply "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/edk2-*/ > /dev/null
+			eapply "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+		rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+	fi
+
+	# ipxe
+	if use ipxe; then
+		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
+
+		# gcc 10
+		cp "${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" tools/firmware/etherboot/patches/ipxe-gcc10.patch || die
+		echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		-i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# drop flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+	unset CPPFLAGS
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# fix bashishm
+	sed -e '/Usage/s/\$//g' \
+		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	# disable capstone (Bug #673474)
+	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
+		-i tools/Makefile || die
+
+	# disable glusterfs
+	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
+		-i tools/Makefile || die
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--localstatedir=${EPREFIX}/var \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_enable api xenapi) \
+		$(use_enable ipxe) \
+		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
+		$(use_enable ocaml ocamltools) \
+		$(use_enable ovmf) \
+		$(use_enable pam) \
+		$(use_enable rombios) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	tc-ld-disable-gold # Bug 669570
+	econf ${myconf}
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+	use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+	if use doc; then
+		emake -C docs build
+	else
+		emake -C docs man-pages
+	fi
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Created at runtime
+	rm -rv "${ED}/var/run" || die
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"/tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+		dodoc -r docs/{pdf,txt}
+	else
+		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
+	fi
+	dodoc ${DOCS[@]}
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+
+	keepdir /var/lib/xen/dump
+	keepdir /var/lib/xen/xenpaging
+	keepdir /var/lib/xenstored
+	keepdir /var/log/xen
+
+	if use python; then
+		python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py"
+		python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so"
+	fi
+
+	python_optimize
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config system at boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+	fi
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 08ce3edab76e..ce27f37e518c 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -2,10 +2,14 @@ AUX xen-4.11-efi.patch 1971 BLAKE2B b24f9315cff7f2de2a945088363429b9f4dd7a4101d3
 AUX xen-4.14-efi.patch 1969 BLAKE2B dec62e9b04ce23025443caa68df2fd69c50a3fdf650bf26047b28f3a72d1aa58124127274cd2c1373a4e133784b2691145c49c9a182bd635aa9c60bb1e45a0c1 SHA512 3e32aac5ba2ec371a3877d64532e8d134c3b4fe3a6644477ee8ecf56cbb8378b20f9d5d7415bec891d96910550a787848779c82ee4b9d57046f4c13235531ea0
 DIST xen-4.13.2-upstream-patches-1.tar.xz 15832 BLAKE2B 4e20a1e2d575ed7e1d21f3b34ed0d8bf6e1405cb39cc5c6ffc099614ea833ac9794bfcfcdea0893fdf81b318f536017ac3a023ad096bc8a8c7390c01f1d513ed SHA512 48dda9dadec1e87fb7b6952636e73057f6e0a5501f9727d05ac636fd47747194501db709c8ffa7154e79b6b612a98b658a03bc083c5065ff851ac57f454b599e
 DIST xen-4.13.2-upstream-patches-2.tar.xz 58992 BLAKE2B 535d67ae6a30e23feb975172a9e4abd6d7feb6c8c969aa243fdf672ed6580fe46bf57ea5530eab70457e22af9163f95061fdf97d10faa3be9f4c92033187c950 SHA512 6b6cdf72d13c0e595be65e3107c0f68299e932b74d4a1c4d59bfe3be8b76840c47f6adeaddd0efac71d5158cee8d778a0be863eea8f032cb9acf4191f629d8ae
+DIST xen-4.13.2-upstream-patches-3.tar.xz 63660 BLAKE2B 80abc9529ff49e782b64d4b5032f724e7d95fd255c2a06b7065c693d5765e1db1df44ebd5ce00c5a1e1ff24e1e5d344b0c2e459c68282e58fa20963e208272d2 SHA512 35288a1feac1316c33586dad55685e2c6a30100795e31852f78455003ce3dd6906074bea023655ee545a97fe4a0a8ad9a05ab91fd83186e61e5b57d10aa6b155
 DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
 DIST xen-4.14.0-upstream-patches-6.tar.xz 119116 BLAKE2B e3a0f807182d32754c6ae2000324237117cfa66c4a43c27b583b6aef69a3889949779751b71a87b2538f679fb481e8a723433950c689f28a8c2e96278c1b0ddb SHA512 03b1fdc08e74756001fbb0de4e21297456f63615e6f63b8f360f8270ef85b0d50c3872be41cc26529ed0d91d82ffda2af53882b7c5233113f223a4ec813a0d5b
 DIST xen-4.14.0.tar.gz 39950576 BLAKE2B db4c3e79cfdfb10260d0d14d9d28e8c8bd9bf23f42aee743acf8f560bf4cdb96a425c0df887c70f9755f62680be24bfbe0149e52a4cb843ae83090cd9d6afc71 SHA512 ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0
+DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9
 EBUILD xen-4.13.2-r2.ebuild 4443 BLAKE2B 9b0e5d974cebef78d4752b62b652f7905ff7ef3f6e59c085a3a02c60b160c7eff1e907e7e8e49a02c4dca52d3b317007cadee89c2927c127d7b9ffd1d274b174 SHA512 8c35da3f78e3cb1b4dd3beb21376920eeb0a92b9c8fc92c736d75c94597a2abf77630bea20a48266477fbb9655be5c05f348d10b4a7c8c8c7344b3278a18fc23
 EBUILD xen-4.13.2-r3.ebuild 4443 BLAKE2B a31dd7322d601fe47f2f1780f0f5d3e0795de536a2f229543137cff8b2982d69a572c54a37f912870b18b638fa96805c07f635db8892246c5cdd39c29a904bd8 SHA512 1dd6d906b85e4a3e546a6ea4a6ba10270334bb095c1e4e265663ae4038c03fe6ec28ae2ba645109b5c97c23399e0889d1733d1d1aad4be16ac01c037472970d6
+EBUILD xen-4.13.2-r4.ebuild 4444 BLAKE2B 7e377267cefdffcde5bf82780afcf61cb68120cc3a8e4c083ed0bb1f4fc7fc01aca0fd62d08fb8f1e3ba1481b46bbed4e88f633b4fbc1361dad7cbaf0eeea85a SHA512 929b589991372aa218e7fcd59ac634d38e59a851fa61b08f04807992b1d880e3685325d5a86c8fe086a44ade8ec1e564694e15fdaab50981326a3174f6edd313
 EBUILD xen-4.14.0-r7.ebuild 4444 BLAKE2B e6742d24d02d217ac2b954d6191b6fa3c8ef10212e93d2a9d73178c32daf140b79708bdb8d854dfaf28067e39081b28a4443bd53d14362bd8ea2841b9abc68ba SHA512 2cce5027e9768faee0c6070eb48bd8daee57c0eadce7bb9eb01278e9ddb90115f0c6e861ec23a03928dca3fcf0e6ec6a5c92cfe7afba034df035cf0aef3635d5
+EBUILD xen-4.14.1.ebuild 4443 BLAKE2B b130fe3a6e22344350d4977a363da8830857425ffbf127293a41aa05855882b2ed8e6b834b23063d5676f948fccee58024369e537068a2a6e92ef086ca31bcd7 SHA512 f522dd225c3f66079229d513d94d79c66dae160dd05816d5e7fc6f5900f6d5c6257028d6067443bf85ae6856743f0ebbf29e402f95b050fbe8325b0319750e80
 MISC metadata.xml 645 BLAKE2B ad902c521cc93a54b16faaea212f23c7bdf83a9efe19606eca7bf00b49104386dbc095ff30c4287bb79d5fcd073b77e7c1bbf929ee7b025039a50f8238572f17 SHA512 313d501abeb906c360d7965e35a18d9851e38af73a72a95351517c60a1a39553555a0a250f0bee5bfc8f6496312d6e9c70874be267c14edab45cb4841e34c248
diff --git a/app-emulation/xen/xen-4.13.2-r4.ebuild b/app-emulation/xen/xen-4.13.2-r4.ebuild
new file mode 100644
index 000000000000..448b93a8ce2c
--- /dev/null
+++ b/app-emulation/xen/xen-4.13.2-r4.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=3
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		local i
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+	eapply "${FILESDIR}"/${PN}-4.11-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="/boot"
+	fi
+
+	default
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	# remove flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+
+	tc-ld-disable-gold # Bug 700374
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+
+	ewarn
+	ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
+	ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
+	ewarn "to work fine."
+	ewarn
+	ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
+	ewarn
+	ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
+}
diff --git a/app-emulation/xen/xen-4.14.1.ebuild b/app-emulation/xen/xen-4.14.1.ebuild
new file mode 100644
index 000000000000..eab5d1a69759
--- /dev/null
+++ b/app-emulation/xen/xen-4.14.1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		local i
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+	eapply "${FILESDIR}"/${PN}-4.14-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="/boot"
+	fi
+
+	default
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	# remove flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+
+	tc-ld-disable-gold # Bug 700374
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+
+	ewarn
+	ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
+	ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
+	ewarn "to work fine."
+	ewarn
+	ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
+	ewarn
+	ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 5be2b160d325..819d31fd2164 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
index e86a84bcbe89..0df024e16faf 100644
--- a/app-text/dblatex/Manifest
+++ b/app-text/dblatex/Manifest
@@ -4,6 +4,6 @@ AUX dblatex-0.3.11-no-inkscape-dependency.patch 753 BLAKE2B 2199d6068d86be9a0a63
 AUX dblatex-0.3.11-path-logging.patch 554 BLAKE2B 7b078b4f0bacaffb3449122b561c264de8c8970fe4cbf5459c5ec651aecd3e3ccb7dcc95bfcc8277686133bc3187a5952edd1bc88dae11c2ddac3aa4060333b4 SHA512 ae08b08a435393bf94039edd8b74457a1d4475d8473fa450b41a993ca4ded08f79566bf2dc78144df977fe1f975e1c60b9d02b2dc4579f8c7d65839946e3de05
 AUX dblatex-0.3.11-setup.patch 1751 BLAKE2B a83e41c4fa68eaee1b6e80404cd5486e64f117ca07314463ca0369cd3bc9d64dbdeb8f5fa2f44bee2704c37dda0e1564c461c7d39b1439aa76800032dd96acad SHA512 f77a82876fe28fdc6f9cc689c8b789fd09e703ca4625207fe81a35b1491bcd46a398eb78781fac60c33ac2efcd3d0957fb3604f8a54cd411b0fd4031016ef5fc
 DIST dblatex-0.3.11py3.tar.bz2 1671505 BLAKE2B 44e89f5f8d81105a3401074ad765479c04a495962c3efb3677cec81bf3b85c67a03585e7da8bdbd103cbea84e38d2bc633bd13704a5835c98d70fed644bfc6ba SHA512 48c1445c702e9c7c3ff83c57bb8a0caf5f4b027669a70887af0a23f75f5f99fb6840c4281b8bad9402910f3850af485d432e3109e5fd93184434cc87eb712695
-EBUILD dblatex-0.3.11-r1.ebuild 1794 BLAKE2B ad1b02cfd02ffae9f03716f866d116c51f2bcce04f5ff4e698e50ca42780fa2ae5ab17aeb0b4522afd3e250fb1a2f7b09c94484644d7fca15f4982018fc4f94a SHA512 c5973f654e73dd99422c01bd7d3c893c109335e4874550eee275a0e4ff11dbc1390c94e80b25db5dae76faed1f74e50402aa66350358602a36015b3df0870cad
+EBUILD dblatex-0.3.11-r1.ebuild 1801 BLAKE2B 2011a3be8909ca1b97af26994d28373e7a5b3bab6b38f243bc6d233bbc05ff0ca88f8d900fb95b384c4d8c254d2dcb9e0dbd198d4f284445db0fdbb6bfeaa842 SHA512 09133c74250a516cc438dda4c8cf5ca754cedebdaacc844d8b13af4025174a01e750db7ef6ca66c4f9cca54fcbdad7972479cbe473135c1a78c75fd0fe0e9838
 EBUILD dblatex-0.3.11.ebuild 1618 BLAKE2B 427f03056dfe0ac8d2b8f80b046c76b5aa0110f85d49ac07bcca8978df94d122f5996d0d02d485af58bd9b031351ca58e6bb688bd166ee7030005166669967fe SHA512 35471efbc664a9002296d8ed5dd1644c246056ed6a1adc40932da3cce05211b7e9917f357902d5c9420e74d87b6fb3910f3257ef6b6baae6009a58880b826032
 MISC metadata.xml 866 BLAKE2B 3776cf07848836c14fd82031a49284f982b04b573fd28080c0fa9c7cbe6155fa63c89b897461dc996842a0d66be38fbde2326cdce8aeddebbfcfd777677e2011 SHA512 9806f0804fc5b14a222974a9e2c2cc8a13a7378b99deca9cd9ac5f7cbdb776b3c240b521a6077cb80d1685574ca47a372712526ec994c6bf228b2c784568cf93
diff --git a/app-text/dblatex/dblatex-0.3.11-r1.ebuild b/app-text/dblatex/dblatex-0.3.11-r1.ebuild
index f40eefff3146..e1ee24a8f321 100644
--- a/app-text/dblatex/dblatex-0.3.11-r1.ebuild
+++ b/app-text/dblatex/dblatex-0.3.11-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"
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${P}py3.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~sparc x86"
 IUSE="inkscape"
 
 RDEPEND="
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index 755a048c9a4f..60f82f91b5a5 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1,3 +1,5 @@
 DIST libnumbertext-1.0.6.tar.xz 283416 BLAKE2B d02a521db19a21c6036412f902af7227d7442ca25d38e5e35339f74c8ee6e275ed085aeb4c4f07f998bcdc33ac62be84ce6915dd430594dedad1fa0f65b388b6 SHA512 0b2a5226f363af9a6df90f788f6cdc5fe95ddb524d96ad2db1caf2e7f414649ce2975eae3c9e5fceecbf825a90c736a0717b02ec9671e980ab9cfb3e2df73b8d
+DIST libnumbertext-1.0.7.tar.xz 289764 BLAKE2B dc7a340dd1843ac77088fd31d4343b570bba0bd5758b939ad228d9d31a7f283ce9c11cf8a504e0c14464bfc6962911b7d1c075122d3efaa7014180a57d419248 SHA512 7755c713dd9b9b75e486eac7ffbfb418c3bdfefd67ecb149f0e25a339410814bf73296f69a4e009a17f9f21292f0eeafa931aef60596cd3d932dab47278de8c2
 EBUILD libnumbertext-1.0.6.ebuild 544 BLAKE2B 886724679f53691089fe45359180712ee3bf74c16c7a939fda4b84493283065fc6f9cf9ca4b6890adf6e0f2f390cac52fe4c20294232db7f96fb278e28da4b83 SHA512 d3737fb073898718813b7b0465a295a9e772f6fb119250b6d70522ca09802f79e2a3741788f63985a29c1d55d25f78f55e2f3271ae9b7327b013e486fe38b786
+EBUILD libnumbertext-1.0.7.ebuild 547 BLAKE2B 01bcf67a2e05382f90add525bd38c16a416971e456654c0bd13bf25052c7db56b08c8f49213539d63027674c347b87940271cd528e5b9318bc32ab272c271a61 SHA512 124f3ce9fefb6248c8308ffab658a7827c510aa7a00b7dd3c5ab5e2804436cb39bb359085062d95d9b331c566ef64b11b0d354366c568288e261747c57eea97d
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libnumbertext/libnumbertext-1.0.7.ebuild b/app-text/libnumbertext/libnumbertext-1.0.7.ebuild
new file mode 100644
index 000000000000..bb54e140daaa
--- /dev/null
+++ b/app-text/libnumbertext/libnumbertext-1.0.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Number to number name and money text conversion libraries"
+HOMEPAGE="https://github.com/Numbertext/libnumbertext"
+SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 9f6497fac332..b83f6b8896a6 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -8,8 +8,10 @@ AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78
 DIST poppler-20.11.0.tar.xz 1648432 BLAKE2B 373464ba60ed84863b40eca2e4f99ebc1625ea06f68a1621165675cf46e70713b649f90630049d15c5c2bc59bd0befb437a4039b47e17509d4fcc4fed8586d53 SHA512 c8237e931ef20d939656e2600453fffb12a2beeafb273782b2069aec6e5915d8cc85136982b7eaf5956af30ce00da2faf84d86ffab47f725447dfbb9d6ffe335
 DIST poppler-20.12.1.tar.xz 1660164 BLAKE2B b96198be824dad6bde3ed89cbd05ebae001914c253d1b95321088ee209c73134efbb7f0044aa5d20c07d35b2460f5d17171810f36b873d2542e4bc93f423273f SHA512 a7ede8b11ce73c724fc54bc1e522ecfedaff65a08265c5faee4645765f1d6670a35abf67e57bdebacfd01b2071f1c532a04b9e302939a500fea9185f6e8226d0
 DIST poppler-21.01.0.tar.xz 1680536 BLAKE2B 5f8d283cd26f4713c09b0c102dd3295bc7ae1c2ad2ba0f51d12fdaed5f89a864d98d10be7176e17c5613aa4579da3bea1aca56aff3cec4e5c53e977a1e84659f SHA512 aec130446df73a2fc66851a563a14cb40299212a2de4a0d03668b0fecb28312fffa70d0a82431c774d0c0e3f7293788bd2bdf28c8136aa09ad80edbca4cf0ddd
+DIST poppler-21.02.0.tar.xz 1684496 BLAKE2B f62399a70baa0af36abd9bf7f5bc69003fcdc9b668a64475a6373dbdd9885092a8beb42f887eafdafac5ee17e9aac5b610bad1c9a64af8112e72c82f47e6a304 SHA512 3964990749f38f4468b244c579ff1f2dab7357dfddecb3035d14d3aaeac6ee4be42e76b4a1cc1a8cf53715518def9e92cc59d08c1e22592ced00a9c948989035
 EBUILD poppler-20.11.0.ebuild 3364 BLAKE2B 0bed70002e75a2ef80c1504057f77c6fc89b0729d219352d534f6cec73a117d718364773520ed5fddc6e9f339e275a9ac2278e1755b01d6099fa8bd27fdb8d0d SHA512 674e487dee7bd6cb117de9c4eac0e0c7602e397b0c20224a90edd848ba373364d6d270f51fbbd49ada7528b26675e41179ed03cc6e608abc070e4aaeaa9252b1
 EBUILD poppler-20.12.1.ebuild 3256 BLAKE2B d4d15f8c5326f93b4cb981e6c55c8ee16ceff579d8ef2179a50efcc64a0fe1324e2093f096c6cfbd1f006fb5b3f554bb276f47a1366592e6f30d03475450b6d1 SHA512 44c3d7707917b40b52a681a2772a444fcf9ca0eefb8ce56f76b1b8bfadfccee29bd4ef9674d01dadc24886a84163d8f913978ef6cd5b73e51f8c08024da6df82
 EBUILD poppler-21.01.0.ebuild 3256 BLAKE2B fb1e49a39eb0b6fb4971b909c7f1f9bb5b4ff1f0c141c7cf141d6ba84306a4cf259cba1f4edc109cb8f3e649147004de0940ff9cf7808ac3f80a4d0ec2012eae SHA512 75de0d830cc06808e20d9355d3a551302602ef056c1e9ccdebad7874d500cc31488f76455296dad85100dc158c9b5689c09c5f361bcc19506bc57fbd456ec8f3
-EBUILD poppler-9999.ebuild 3256 BLAKE2B fb1e49a39eb0b6fb4971b909c7f1f9bb5b4ff1f0c141c7cf141d6ba84306a4cf259cba1f4edc109cb8f3e649147004de0940ff9cf7808ac3f80a4d0ec2012eae SHA512 75de0d830cc06808e20d9355d3a551302602ef056c1e9ccdebad7874d500cc31488f76455296dad85100dc158c9b5689c09c5f361bcc19506bc57fbd456ec8f3
+EBUILD poppler-21.02.0.ebuild 3256 BLAKE2B ef04f78cddc929747c2060e4c2fe0e1fe8ae6fc427af0c4fadde96d8bb6e30a7b6b761eccab339aa13ff185ebca2b8c15cb3a7ffce22086babd37e0a1ada7a01 SHA512 f0d74a22a12dadfb27c0b74060494fa753937134ce510e83cb8081de9199dfb98d5620d6d1f8fea755a589d112b940cafd9b7c206a9073b0e9ac72673bf54489
+EBUILD poppler-9999.ebuild 3256 BLAKE2B ef04f78cddc929747c2060e4c2fe0e1fe8ae6fc427af0c4fadde96d8bb6e30a7b6b761eccab339aa13ff185ebca2b8c15cb3a7ffce22086babd37e0a1ada7a01 SHA512 f0d74a22a12dadfb27c0b74060494fa753937134ce510e83cb8081de9199dfb98d5620d6d1f8fea755a589d112b940cafd9b7c206a9073b0e9ac72673bf54489
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/poppler-21.02.0.ebuild b/app-text/poppler/poppler-21.02.0.ebuild
new file mode 100644
index 000000000000..e6d3d0fbfba5
--- /dev/null
+++ b/app-text/poppler/poppler-21.02.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 2005-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/107"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
+	"${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+		-DENABLE_QT6=OFF
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 0c0be114df56..e6d3d0fbfba5 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/106"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/107"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index de97bb643f7d..3c84e92dfb4a 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/sqlcl-bin/Manifest b/dev-db/sqlcl-bin/Manifest
index eb58f7940ebc..a0ec35034a68 100644
--- a/dev-db/sqlcl-bin/Manifest
+++ b/dev-db/sqlcl-bin/Manifest
@@ -1,3 +1,3 @@
-DIST sqlcl-20.3.0.274.1916.zip 36309483 BLAKE2B 10051c6880da74a2803c3dedef4ff397eecfc92fb57ca3a7432d32041a2a255ce30cd4b69d242bcea182a30c200b89105fff40c0419cac371c99dfaee192b18c SHA512 b170bfb5ed31ccbf69b75f1ec7c2b292cb8d0bc70c8489ee6c42c288b54153ef8b8b2e4e0511dac1522d9b6cd161f66adc50d85574e8e8f3b7802d3a9f91a70b
-EBUILD sqlcl-bin-20.3.0.274.1916.ebuild 937 BLAKE2B 838e0215c542324f2d80519deedfef87084c92546f18f0ca224a6fa684ad6c787a90232ea24e9a6944131a9ef87eafc7e03ce33dcaa99b0d1b510ff6993ba021 SHA512 2c45d150dc664633c040044eb73dafb0ddec972aff56d52aec13040a6c7112612b70ce0e7f8f96b1f2a38062f1d2c61eda0724eed8574f74aec3f845de6495bc
-MISC metadata.xml 483 BLAKE2B 1ed85dae79388f3c548163e5fafd2838e1adf9bfc9a9c793ce7f9e7e323f8e3c9e7e2f3190b3ec54a0c598d048c61b6ad67c8eefb3845cd446ea67b01e0df8a8 SHA512 e88ad9fd8c20d5be5569c64544c3f4dd72eb3243d46333c30aaa1b939eb6ce35855aa3e771008b2fff990de5b2e5bf79ca378714e3cf7dc375144b7cd8f5649c
+DIST sqlcl-20.4.1.351.1718.zip 36694031 BLAKE2B e2c3548676223891afdf346ed5e9e3150557251e017cc6b13709f00998113a9fe44d20fa5e5969b7c4671c88b9daec77dc7f730437e1be71fd93f1f542a7c4d5 SHA512 14efb04f87da6b3e93edbc654164ee25fe8258bcc5ba91ff2e42e10d036e493e0e65c2e82795ba7ac93055af7d2d923e35573e63dbd3f22c2241bd3041c3e56d
+EBUILD sqlcl-bin-20.4.1.351.1718.ebuild 937 BLAKE2B e21df4f4713969555029c69f4af4a494e0c4cd85bc5465aec3f915064b8f7ad562e1d12936cae5cc4c80005611c1d7f5defcf474a745f5a18a87a2d30ca2218b SHA512 0cc3d5ae15deeb45635d23a89ff82fada8450e4327df6565bf10faf522e431a1c09931e9d5ef64deb3173ec63b50d5247236aed6a1c2e7eed53b3fb300764fcb
+MISC metadata.xml 371 BLAKE2B d19be76b4ad2e2001f890c52fa894b50dd3fb63de95eb8b1a36666efe3e087c4c66d33a4d9d369f1ef3bbbc9be59648d91859448da8cca1397da8dcaf8efc1fc SHA512 5ffa59cea45522f04e42a63fb486e8584f30d07ce5ab9c9d875cc7342d1ff99665db25585d924b3f5e25eff42e54c55a3e970cd9b88b32a1112066d9a8c214d8
diff --git a/dev-db/sqlcl-bin/metadata.xml b/dev-db/sqlcl-bin/metadata.xml
index 0a47874eaf48..cc2aa77ecc42 100644
--- a/dev-db/sqlcl-bin/metadata.xml
+++ b/dev-db/sqlcl-bin/metadata.xml
@@ -5,10 +5,6 @@
 		<email>fedeliallalinea@gmail.com</email>
 		<name>Marco Genasci</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>mudler@gentoo.org</email>
-		<name>Ettore Di Giacinto</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/dev-db/sqlcl-bin/sqlcl-bin-20.3.0.274.1916.ebuild b/dev-db/sqlcl-bin/sqlcl-bin-20.4.1.351.1718.ebuild
similarity index 96%
rename from dev-db/sqlcl-bin/sqlcl-bin-20.3.0.274.1916.ebuild
rename to dev-db/sqlcl-bin/sqlcl-bin-20.4.1.351.1718.ebuild
index bc18cd9f85e2..ab45e758fa33 100644
--- a/dev-db/sqlcl-bin/sqlcl-bin-20.3.0.274.1916.ebuild
+++ b/dev-db/sqlcl-bin/sqlcl-bin-20.4.1.351.1718.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
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 639696a78412..856c3a5db72d 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/dbus-c++/Manifest b/dev-libs/dbus-c++/Manifest
index b50635233b26..43430b8b80cc 100644
--- a/dev-libs/dbus-c++/Manifest
+++ b/dev-libs/dbus-c++/Manifest
@@ -2,5 +2,5 @@ AUX dbus-c++-0.9.0-gcc-4.7.patch 1073 BLAKE2B 2cc43e4d23c14646adfffae77bc1168b69
 AUX dbus-c++-gcc7.patch 891 BLAKE2B e3f1c902b52cbec776849c86d2d4c7a13acbc907355c380cad7eabdfe670d9058a1ddd3687af9bcbbd4d815affea21728d8296f5a87122bc6b5fc99396ea0428 SHA512 b8c67af11620c2414d482cb3d77784f7c9831e64e0bc9cb9b946e13b0ad13135f06cfb894667fb9b184e6fc7e750df0769a2d4c09df4f430c2189c2c3804fbae
 DIST libdbus-c++-0.9.0.tar.gz 466362 BLAKE2B 401e266286fef383754c945f3adcf8e68a1169e55d33614f1e11227c324fe1219db7043674b5894d548f827d0b673ab4f012babbb4a395c212f6e17ef6d0e281 SHA512 7acebbb4254b2886cc0f05c5ddeeeac0b5863c5552d32249463b89380b0b95b8225c80bd98b8c7fcaada42ab770b5eff41b15390cd0d78bf1ee322ac6c2de319
 EBUILD dbus-c++-0.9.0-r3.ebuild 1716 BLAKE2B af521bfc1a4162a3b34405815d3ba69fc625ceb4af960812f8a21b84f1c06cd36c4775028e32608a0e6555e105b6d989778701a7b59c6b2e3051cbfa71ba5187 SHA512 c090408d04caf9bedcbd71f392a88552f63621b727e01be8b26edd0adb73854479672fb1f93420b4b9b676aa67477d476bb98ee6326fd15745e695854cf073f2
-EBUILD dbus-c++-0.9.0-r4.ebuild 1614 BLAKE2B bad2fd190bd8a737ad0d36fea9ced4be3ace562903d58392a4fc6f4504afd8c95dd5601ffdcb0c820a82ae4c46a464c2f72f1aa2f2336b375faf37005f3f35c3 SHA512 3def5a9297ba1ad8f5772054fac38fed1080ad5be741f3995cef68b862e9fcf5a752b5db95e5b0f9963c2084595e9dcfb31a4d16eb5cb6c254daef9850d842af
+EBUILD dbus-c++-0.9.0-r4.ebuild 1613 BLAKE2B aa91bed053176d5a2812d7404fcce52118e03ceac25ec65b79a5d52f3b054a01e9eda212de6ed933cd0d560b5f2713580213f37dd686c4a4a9f74da0324abb81 SHA512 c8346b94cf2fd4cba79194a662b4a84579fc4c350c5b4f857ef8d173927c3788af11be4f4455608e1fbc26bfc73704cc50b0dbc5a4b7a862c3bb48b06b4733ea
 MISC metadata.xml 364 BLAKE2B 12695ecb75cc83a5aff33d9d6a0cb001b3d37d8d567806d1d76c79246e94f0796ca65a19799e18c06ef4f22fa19cb434521f1f7c02b0234ac5a7f8fddd2f1edc SHA512 9b4bcacc042091d3d5c058f2cd98d48ba3fea02b4687d137d95dd6219808dcdaf964793a6d6761c29a52eb31e55afa17bb45717d85c8904312a66f6c5ce03d9e
diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild
index 0c861a1221bb..ea5c32b3c3d2 100644
--- a/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild
+++ b/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dbus-cplusplus/lib${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc ecore glib test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/granite/Manifest b/dev-libs/granite/Manifest
index e6e3ab154839..5a854457d194 100644
--- a/dev-libs/granite/Manifest
+++ b/dev-libs/granite/Manifest
@@ -1,3 +1,5 @@
 DIST granite-5.2.5.tar.gz 392987 BLAKE2B 507c3b810b750257a66195b45842a7664eb544f86a8606124d30d277c03680296f1ace7a9233d6e094ad5ce3357564e13b61d946f8ed926ccf22a5d9b5e98648 SHA512 64a08293bc4b33d77206c7070b4e2002dd8e2da8a358e43074b681a9228790dcb342d3a705cfc0309a7e1e7f498a2a656e972c2fee085ba99fb5214e33758fc3
-EBUILD granite-5.2.5-r1.ebuild 1867 BLAKE2B 3731912ee305d02bf85b53b83f2d45a342494ec21ee668a774cf1426f51ed41e55fdc4d66e38670bb38b64c7945be7d108946a29abd6d3e168e0afff05eced7a SHA512 ff7953d1d51b4317e8043d5afbec2931cb097d36dd71b39cb516f8dff16910d90a9fdc499b5d09edb104e52158f5cbf3b4ac73d79486b84f169f992159b23647
-MISC metadata.xml 479 BLAKE2B 39d2fbbb6b128236ce6565ac9e765928351c4b5f953a96b293a61a3f0deb67ef8a05066b5e0ca0547d616e303c721815c405ca185318b1cf4fe59df31540c170 SHA512 394f3a02381f849c82e112c064c045d7afc2c8ac62e2788c049332447b27b094da1301eb649f562850c04ba02a4d7bddfe49569e5623da8bd714897d770b8dc1
+DIST granite-5.5.0.tar.gz 421478 BLAKE2B 9b6e956fcacf5dba722dd999ed3de527a99bd305a2059bdc39fe00d767f0f855e8f3a4d0854fd441203bb5dfbb250669356f85b64e067ddc08e3d6dfc3fb389d SHA512 981ff9aa42146153d8450989513dd6b63cfb6cf2e52cf3e1d2d6380373b30754d9b357418810cfd14a53689a050f08337ca766b5b8496a4063106f78b377f139
+EBUILD granite-5.2.5-r1.ebuild 1860 BLAKE2B 2d1137832f99c220ce6893bcbc7af6ca471551bd35d9890837aab0f4d5938c7d6f418a47f869d8f729f4145cbdd099aa9796e3de96181e76ecda8f748fc2ef7c SHA512 711548b6e8a56962667195b4f67a55acd125fbcf0751a9e4d08c647ec978db88f50cf1be60d3a064586f3ed30955a5055b7dafb16b439ff19ef6e26eac028de6
+EBUILD granite-5.5.0.ebuild 1322 BLAKE2B 9bf5cce71d79ab7779091cc5c077c32541011c257396e7d39677b572a89ee84ef7d99835e5100d09845fdbff21fbcad56634b50de2f70c998e5b32e4141b1824 SHA512 3f3417d6e83a271b801393490178f7f5586f77a28e114a22646e5f53bd3cadcebf186834b7811244406c0dad1c513ed2f39ac5c8ddf39c7b72942ce202bc47d4
+MISC metadata.xml 748 BLAKE2B 7f6eeeac0667efbdc6bf98c22207688342ec8725865e85a1990ff67d60e5c28e8a9ff88f628ce1b8476362b24a8220ffc585f3107dbfa53241280e2f14b8c511 SHA512 5cf1e483842eea74f495b72e3887c0fc8a64abe163c951b15b130a660de3cd4bdb41a5dc981a6d24b5ce77fd5ae3d567bf6c6c6c51c0275bb12f9a7991f5fb61
diff --git a/dev-libs/granite/granite-5.2.5-r1.ebuild b/dev-libs/granite/granite-5.2.5-r1.ebuild
index dc1cb86a0666..56f8f0eaaf6f 100644
--- a/dev-libs/granite/granite-5.2.5-r1.ebuild
+++ b/dev-libs/granite/granite-5.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,21 +15,21 @@ SRC_URI="https://github.com/elementary/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
-IUSE="doc +introspection test"
+IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
 	$(vala_depend)
 	virtual/pkgconfig
 	doc? (
-		dev-lang/vala[valadoc]
+		>=dev-lang/vala-0.40.20[valadoc]
 		dev-util/gtk-doc
 	)
 "
 DEPEND="
 	>=dev-libs/glib-2.50:2
-	dev-libs/libgee:0.8[introspection=]
-	>=x11-libs/gtk+-3.22:3[introspection=]
+	dev-libs/libgee:0.8[introspection]
+	>=x11-libs/gtk+-3.22:3[introspection]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/granite/granite-5.5.0.ebuild b/dev-libs/granite/granite-5.5.0.ebuild
new file mode 100644
index 000000000000..985b8383dd0c
--- /dev/null
+++ b/dev-libs/granite/granite-5.5.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VALA_MIN_API_VERSION=0.40
+BUILD_DIR="${WORKDIR}/${P}-build"
+
+inherit meson vala xdg
+
+DESCRIPTION="Elementary OS library that extends GTK+"
+HOMEPAGE="https://github.com/elementary/granite"
+SRC_URI="https://github.com/elementary/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc"
+
+BDEPEND="
+	$(vala_depend)
+	virtual/pkgconfig
+	doc? (
+		>=dev-lang/vala-0.40.20[valadoc]
+		dev-util/gtk-doc
+	)
+"
+DEPEND="
+	>=dev-libs/glib-2.50:2
+	>=x11-libs/gtk+-3.22:3[introspection]
+	dev-libs/libgee:0.8[introspection]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	vala_src_prepare
+
+	# Fix docs
+	sed -i "s/find_program('valadoc')/find_program('valadoc-$(vala_best_api_version)')/g" doc/meson.build \
+		|| die "Failed to replace valadoc"
+	find lib/Widgets -type f -name "*.vala" -exec sed -ie "s@{{../doc@{{${BUILD_DIR}/doc@g" {} \; \
+		|| die "Failed to fix docs"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc documentation)
+	)
+	meson_src_configure
+
+	if use doc; then
+		cp -r ./doc/images "${BUILD_DIR}/doc/" || die "Failed to copy doc images"
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}/doc/granite/html/." )
+	meson_src_install
+}
diff --git a/dev-libs/granite/metadata.xml b/dev-libs/granite/metadata.xml
index 7ba599558211..eb3302b9001c 100644
--- a/dev-libs/granite/metadata.xml
+++ b/dev-libs/granite/metadata.xml
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Granite is a companion library for GTK+ and GLib. Among other things,
-		it provides complex widgets and convenience functions designed for
-		use in apps built for elementary OS.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">elementary/granite</remote-id>
-	</upstream>
+    <maintainer type="person">
+        <email>xgqt@protonmail.com</email>
+        <name>Maciej Barć</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <longdescription lang="en">
+        Granite is a companion library for GTK+ and GLib.
+        Among other things, it provides complex widgets and convenience
+        functions designed for use in apps built for elementary OS.
+    </longdescription>
+    <upstream>
+        <remote-id type="github">elementary/granite</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/dev-libs/hidapi/Manifest b/dev-libs/hidapi/Manifest
index 29a8d1d25032..c8e5b05e3d57 100644
--- a/dev-libs/hidapi/Manifest
+++ b/dev-libs/hidapi/Manifest
@@ -1,5 +1,5 @@
 AUX hidapi-0.8.0_rc1_p20140719-autoconf-2.70.patch 300 BLAKE2B f82fe6a6e2ebfda10eb9762bbff1586346ecf8945996599a3b58658c37799d85dc573f8be54bba483f95e27177db3f421d99ac713e7012130d2e2b92252ebd87 SHA512 5b29caa5f7a9b61fffb16226cff9709a5b142c6ac36017c567ab5933b21f06cb17c78a93fa19e8c92cb1443f1cbe97c3687002845965bea2b3ef39eeaef1f4a2
 DIST hidapi-0.8.0_rc1_p20140719.tgz 103079 BLAKE2B f40a4c17cb8c5eed41f4eea84fac46a879ec2057f28212aa43c8fd718ceea68d760785cb4f4e2ea3bcd2a4345b65d75d0d278b93697ec61963be9270684a15cb SHA512 204934a707da4e67b834823650b0cfd9be7b413972071129cc5aeeb93465834dde2f5ee23283c55d35b56e3aed8b7ad5fe947399839081f4d895fb65c8cd3e3d
-EBUILD hidapi-0.8.0_rc1_p20140719-r1.ebuild 1846 BLAKE2B 114ceec61e90c1ada45c8eb9e5aec9194be98d8ed19306852a48b59812f3805f24cb92902c76dd84cbce338663488b2304aa932102d3b087749bbe6a30a0bcfc SHA512 2bad7544896966bc660d6f392ecfffc1c6f8a24ce883e53019ac69a7a12fc724f24efa70c1acd8712abac3d311a54b2619020f647541e284ed06eb68ed588c01
+EBUILD hidapi-0.8.0_rc1_p20140719-r1.ebuild 1845 BLAKE2B 8739529dfb703312efc9d736a8ae895d4359d8e236960d315145a7195150ebd5945b3d048ef60f437abca65f221a9649fad1f98dee9303956521cb01af28df37 SHA512 e7687e1b52efec017253d1218f5a1f14701cedb9e9fab8c6ab3a272f11109045400a506955f672193ec5bae83264a3ef022c905e9d3c1b2e06045dee3d72a975
 EBUILD hidapi-0.8.0_rc1_p20140719.ebuild 1985 BLAKE2B 87615eda8dea3490a69324a0d07dea4fc79d0792ff132a6d10b5ee8387e46245b3fbb763eccdb8d8cfbbc6b4ec7c0bd16c411ef5a8afa0e60a9d64d390b00d63 SHA512 7e25765fb19ee59e2877c4155cd0495b82e3548e25b1c15ba8b3d2f58ad22711480c766b96f43e150268ed1fb5745c03184badcff35cfc0e96272767b3af8af5
 MISC metadata.xml 540 BLAKE2B 6396197ca946971d1e954233589189f5e91dd4dc4fd6182f5cdf24890a5601a5e32fa71e2f4b2a676d346cb8feb1232467fa569f9348a5b788f5ee4a6838d7dc SHA512 3e0185fa3a56d0bb18f1256fe9e5c74cb5cdaea91cd24054d12243512012fdead25ac69c84a82d282b070bd73be2a9a7e313e858c05e6c2fe49bd38cba4d28d1
diff --git a/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719-r1.ebuild b/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719-r1.ebuild
index 869fc66c0990..020ef1b48166 100644
--- a/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719-r1.ebuild
+++ b/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/signal11/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}
 
 LICENSE="|| ( BSD GPL-3 HIDAPI )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="doc fox"
 
 RDEPEND="
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 14b5f5ad4ac8..1b2f5a7b15f2 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,6 @@
 DIST libevdev-1.10.0.tar.xz 445792 BLAKE2B b7638ae85cac8b8d29c3255da1de50a06db9eb97d752b383852c85c32f8f93f31135e9d28acd474695d36d87eba04d455abd99badf6e492c2561893c47f796d2 SHA512 94ab4ee7e0854c41a491d8e4713baa95ae66dd337b41823011c0913aa1c72e8bbf8b808d5936c2ef456af794b6d3a5cd7cd0515fbd1d06dd1b7ba19275bd928f
+DIST libevdev-1.11.0.tar.xz 445316 BLAKE2B f3c1aa688d83f4a27abec23f18817bbdb7a5911cc30fab694271f620c23273cf20109598edb0049239e78a173baa20471ad1f25266eff34a50ed8898d7b86080 SHA512 b3c6b4a1532c5142f3684b920dcdd497a5368aec516e8c389e2c8f9d1eaba16c907b2a7f2c82a3c3ff89bb4d0ae5503c736098c095f9f1bc98f0668e99bf639d
 EBUILD libevdev-1.10.0.ebuild 1252 BLAKE2B 445b3ae22bb70fb6d4f4e9f36dcd1baec01d28b0b4c9c8f3efe26deb452767f6db4eaa1c2049acc0fe31b4a5c9228f7e2ee43cc6acc5a38f8053dd1255c35407 SHA512 2bbffed6d3693907dd99588b83a76db4c9b19c7c0eeb90976a4e4dc58d527097f540ba75a77c3f31e9e3cb0d144eb5cd2fab6e7db0b5e7225bb85a6cfc3d7894
+EBUILD libevdev-1.11.0.ebuild 1253 BLAKE2B d5abb022d4bd0409b5bdf3b9614cdd30b8650796fbb3bb510505c65576f75b6be872333aed5e953cafa4856df83f2b2d09b078c2fb8c0f3bab9ea3b792019dfa SHA512 651eecb8b2840382cdc4bfbb3885bfd9b1d7ad0804b73fa8d659aac4f6a41276195a01bbac8c4f1a6ca7b7449df938f1b43ad2ce58cfec9f6d3141259f59f565
 EBUILD libevdev-9999.ebuild 1253 BLAKE2B d5abb022d4bd0409b5bdf3b9614cdd30b8650796fbb3bb510505c65576f75b6be872333aed5e953cafa4856df83f2b2d09b078c2fb8c0f3bab9ea3b792019dfa SHA512 651eecb8b2840382cdc4bfbb3885bfd9b1d7ad0804b73fa8d659aac4f6a41276195a01bbac8c4f1a6ca7b7449df938f1b43ad2ce58cfec9f6d3141259f59f565
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.11.0.ebuild b/dev-libs/libevdev/libevdev-1.11.0.ebuild
new file mode 100644
index 000000000000..dbdaeebcd51e
--- /dev/null
+++ b/dev-libs/libevdev/libevdev-1.11.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit meson multilib-minimal python-any-r1
+
+DESCRIPTION="Handler library for evdev events"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/libevdev/libevdev.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc test"
+
+DEPEND="test? ( dev-libs/check[${MULTILIB_USEDEP}] )"
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature doc documentation)
+		$(meson_feature test tests)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed"
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		local HTML_DOCS=( doc/html/. )
+		einstalldocs
+	fi
+}
diff --git a/dev-libs/liboil/Manifest b/dev-libs/liboil/Manifest
index 8bcd3ed13ac8..06585f19034a 100644
--- a/dev-libs/liboil/Manifest
+++ b/dev-libs/liboil/Manifest
@@ -2,5 +2,5 @@ AUX liboil-0.3.17-amd64-cpuid.patch 1040 BLAKE2B 4cf2a34250d08175c7bf466b93fea90
 AUX liboil-0.3.17-x32.patch 7762 BLAKE2B f3402d64fa9ef13e488aa07d7565782b38e585e7ab73e8c6d4c33882ba138734c1369b87ec549850f9cd9b9d2a85cfd0e3972eb038863c1b632fc5ad2c34a9fa SHA512 83201a8a03a3785f228d9bff916928d80fdbf8abeaa27f715956c09b2a2eaffcffcda97e680abbb7b29b3f207531ee935489c1f226796a34968284751ffbd8d5
 DIST liboil-0.3.17.tar.gz 912563 BLAKE2B c7ad7cc4db422fd2a3fd2be01b81a8a2f4c9acbc7407955e30b8ca6d39b79a235f383b4897e01a51a9ed47f4476e321a0bd6522951a125acc2da85f38ea40770 SHA512 26f60d37af8aae435ff17f2aa852a4e52cebd96ef7be04cb4dc14c61bc42160e333e317e5b33f05f6d4b6c819b15c4ecd1d4c03018515252daea26dd4ed60145
 EBUILD liboil-0.3.17-r2.ebuild 1604 BLAKE2B 7413e1821afbee9e6f7e671d3841a5261804c493a1e9fbf30e889c09a9581eb962e2e97669095fcd19c04b2ec81286010e213ba5cc94d0a65fec19374757494c SHA512 20004b9e395a5a2f6cf7935affd1e020531c45a7831c6581818b94d45f01dea83be3ba412591c2d4a470a8b9d28d47e904a2e2ad33081e2cc6fa3e05189979df
-EBUILD liboil-0.3.17-r3.ebuild 1750 BLAKE2B 4ff81a92402b0d69842acc75db50bc1e395d7808e766126918bdc03184b5d707433b660fe5382c92b23ecc12a5303673354059c262a9bf82b1bd99a396fc0fe5 SHA512 faffdffc48469805acb7f887e5a22a07e541e11444dfc4208dea22f557d0a0ef01e67b12df14b13df64631778519999e9fc79d30cfc7e4a9a028695549a9e6ed
+EBUILD liboil-0.3.17-r3.ebuild 1749 BLAKE2B c752870927d8ef64a8843b9cc69cfb2600b390d3e372cc86c78ebb2a4ba7c9045e59731ebb98b9a2540f55c8b9dbf6a467b25a1693062a8097c53e439bfde01a SHA512 6fc93f64590b737a0ad0dfd085007d126e6d4bb09520629e9aaf18d3d2b4c39cd673b3daa9a10b4da964b19d7396cafc73a4510156a36821d0c1e1fd0188a4d8
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/dev-libs/liboil/liboil-0.3.17-r3.ebuild b/dev-libs/liboil/liboil-0.3.17-r3.ebuild
index b0545a3d753a..d31a433f0e08 100644
--- a/dev-libs/liboil/liboil-0.3.17-r3.ebuild
+++ b/dev-libs/liboil/liboil-0.3.17-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://liboil.freedesktop.org/download/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0.3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/udis86/Manifest b/dev-libs/udis86/Manifest
index 0b8982231cce..b08b245244ff 100644
--- a/dev-libs/udis86/Manifest
+++ b/dev-libs/udis86/Manifest
@@ -4,5 +4,5 @@ AUX udis86-1.7.2-python3.patch 1543 BLAKE2B c2bcd32c934e2a3ae5232ab6cf2516ae0598
 DIST udis86-1.7.2.tar.gz 445085 BLAKE2B 0e67a1ae28688a5febdb4502714a6d99b1fda9028470bac1ecf9314d33c2f081726e3706e9616f352fbf1561283429cb96b92ea4a88e454ec21eadc84bb336d8 SHA512 8cb35d70ac020cd74ced22252aa735a266e5db98d89df565a560baa4ace0cd730e9db838241b70c3b93c27d6b2c75a88edf9c357c864d0f0104323925371c96f
 DIST udis86-1.7.tar.gz 696651 BLAKE2B 5d0a97e06b6bc7b263b6f080e12f832d4bfc9a4791a495e49cd2f4ee6d37d13e593891e02fe9ee3c3fb5e7ec23bf25ae7aa1dccd1f95b5c003f6a6e45bbb7f8d SHA512 df0f802d4c0cf6b39b5b996cfd721cb7d0bdd1b0e2f2f7bcb7165514541b94d795c653e885d9f928d9a27f19464ed6fa948f4315fc1f3887079201fcbb2a241e
 EBUILD udis86-1.7-r2.ebuild 727 BLAKE2B 9435654d37e1dba515e815fcdfb6f07bea96b9743dbd22e9a11400924f89a1fbbba30203216184fed53abe71501326e11708a01bd19dc4517e1b30a545f36788 SHA512 1901dd09fae0f12e1c4a41b905460704794708803f1c68e04203f0612a63d1a8057991fdbbcf24bb0e1757f3c2814f4793ea698bf45265dad3806e05fda96e15
-EBUILD udis86-1.7.2-r1.ebuild 942 BLAKE2B 6d3c13c937c74001bfb2411d7dafb10525ac5b34b8f109f550d4c097b6a7319b451346eafa673322806f5af6633f4992c2dffbd5f73b451c2e67e9c5571c8200 SHA512 04d73b7d3a9f5d79089065fd42e3fe590acd52f05ea18a9aea69802e9c092cf25eec82fd636f51006a18dc221ead1a7bf56bd984a3d99ecebd8b0aef047ccf9b
+EBUILD udis86-1.7.2-r1.ebuild 941 BLAKE2B 56852542a9ecfc48292f2edc6d836ee4d1370c4449122568fadf163987f4bdf6af2bca16caf4012cc8b5435d142a49969d3198b765d8f02fd95cc2d3476968ee SHA512 34e3fff101b531ec42ca16407336a0d107c1a5fc1c9cc3c3ddc9a0def2c23b7b3f1a10eb494e8db6ff4ebf54b12d71d75c6fbaf8c0aa90c7a0e538cb10366576
 MISC metadata.xml 342 BLAKE2B 5f721c4727a6ee72b711b6df53a260dd420e4389f02091326483aa69995817965b8375097d3abd519b6c25e5cbceecff3de7efdc23178a2d98ee5d64522522e7 SHA512 042c3b3a181b435308c2c6cb6fb411cf5c00fb0403736a7fdd4048553c5d3ce7b2130421dd785511ec97b2c0e55f0e6e3cc603273ae5f87d19a61f9da0914a66
diff --git a/dev-libs/udis86/udis86-1.7.2-r1.ebuild b/dev-libs/udis86/udis86-1.7.2-r1.ebuild
index cfea4d942ce6..f7f19738e446 100644
--- a/dev-libs/udis86/udis86-1.7.2-r1.ebuild
+++ b/dev-libs/udis86/udis86-1.7.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 10fe81ce4e91..719f6555f8da 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index 5805456e2c11..b7ac9d61e6eb 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -3,5 +3,5 @@ DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d8
 DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
 EBUILD dune-2.1.0.ebuild 684 BLAKE2B 4b50322912687fb84f6636dddde7a61b89c4147a9a92c8bb03619adab13a23098473380076e84c2e1e5ed5c8f7c8250ee21c4ffc749433847216c272270a5756 SHA512 e9543ae6e8e26cea642dd709242076b6860ac584df7fdd005bc73fa441b551f566f64611008bad1d9875b2c09c5e941c71eb08df158d8e0a0359d8e7cb889b4c
 EBUILD dune-2.7.1.ebuild 763 BLAKE2B 162b88e861fb9cb45a184dfb572a2ea0295860bc005248004ae49eb862ae38625580c1db41bdfa8d675bb38c6efebabc38101a9c381b46db75fcd0dd07a13cfe SHA512 82da37997041557ccc49544f0bf4230bb154503fc91c04800b8fdea5c4d5901c653e6e4a5479fee9a681efea8e9d1cb5a4fa6b6abe3aaadb8cb2e860a52c008a
-EBUILD dune-2.8.2.ebuild 760 BLAKE2B d041a466b7c3ad4ff20b2863e0c2fcb9a26dfe7b366438b321d2119984394264a3f425b8918fc757ac735761b9b1480f383b260368b3bedf2769c71309606e63 SHA512 d48d9f3cf170d5522a2093fdbe9f3b4b39c1e0b8223431c6d437ed4f1353c3f6ddfaa27eee4747607e7b9c035a18879be9f3b498d1749dabf4c86b6208b3f732
+EBUILD dune-2.8.2.ebuild 786 BLAKE2B 608586b99dbbe36692c567e6c6a481c4568b611f5509241e17d730fb2f36e07348c475a8f776056d3d7ef6e601a748f163172651c81c867947213d16ee258b87 SHA512 cb7ae85aa930f9324a9c585a68c68b036a60561267bd281c98021088ea9d55dcc11691049ba4b8c9d86ea53cc41db26e6f3b08f414d58e5e6ede85b997796b85
 MISC metadata.xml 412 BLAKE2B 1ac46aa4fe2b5f531debe5c283c36db66a98d2120ceaa389bb2fe5c9c989a8185d0c66df879bfcd65f89e6e304359beadd632e445220a633887237bc9159ad8d SHA512 74df6c8368d4283dbda004fba147e5fa5c82165dc6a7553bf61f49d93ef7283160f6c193505d42f4043e2d3ac3227d4d29ee99827845726f146603088a61d76a
diff --git a/dev-ml/dune/dune-2.8.2.ebuild b/dev-ml/dune/dune-2.8.2.ebuild
index 2a7afe515103..1a098b5da747 100644
--- a/dev-ml/dune/dune-2.8.2.ebuild
+++ b/dev-ml/dune/dune-2.8.2.ebuild
@@ -13,9 +13,10 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
-DEPEND="dev-lang/ocaml"
-RDEPEND="${DEPEND}
+RDEPEND=">=dev-lang/ocaml-4.08:=
 	!dev-ml/jbuilder"
+DEPEND="${RDEPEND}
+	dev-ml/findlib"
 
 QA_FLAGS_IGNORED=/usr/bin/dune
 
diff --git a/dev-ml/ocaml-gettext-stub/Manifest b/dev-ml/ocaml-gettext-stub/Manifest
index 370db917e985..65f6affa594f 100644
--- a/dev-ml/ocaml-gettext-stub/Manifest
+++ b/dev-ml/ocaml-gettext-stub/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
-EBUILD ocaml-gettext-stub-0.4.2.ebuild 815 BLAKE2B 9026c3dcc230132991967252a9901e22435e51c84bf60677df7e277083e9926cec7a222cd1f6f02cf62aee468b49c3d82265b88b47597541e82a0b02ec681892 SHA512 eaf98bdc19abcc78506a09b5e406ec8927e350a37e55753162639583297900a5d8284f49a6e0a4e25bcae5f61b40181267ead3d665499d04a4e1b364df2dc16a
+EBUILD ocaml-gettext-stub-0.4.2.ebuild 845 BLAKE2B 374225b66618373de9cb49a469c86e8928db5da187d5585fc9df215a24920f490e4161afc63ac11565d079f15f8db2dc67cab5187d605db1d56415f6c489cd65 SHA512 45325f76eb977b7f0acab9a485208158c464d72333403d27f153eed8f30de5723af59efd82d6f7dc02ebd955d44e942359864022d0d773c76d8b89e397b57ff1
 MISC metadata.xml 632 BLAKE2B d683f2b55fe66ac0ccae90494f7485042652afc9a1c01d583cef1fb9181b15d9a9d66c44eee51fb380318946288e9a05320896f376cc91992115349987ec8466 SHA512 70332af42127e51035802cf05ed4fff1d2ca363ecfe7c43a6db70277e6625de026091f2fc0b98158c283f7e3d9107d898708443121d935f6618ed0d822883610
diff --git a/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2.ebuild b/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2.ebuild
index 187b3fc10c97..c47570d78116 100644
--- a/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2.ebuild
+++ b/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2.ebuild
@@ -27,6 +27,7 @@ RDEPEND="
 	dev-ml/base:=
 	dev-ml/camomile:=[ocamlopt=]
 	dev-ml/ocaml-gettext:=
+	!<dev-ml/ocaml-gettext-0.4.2
 "
 DEPEND="
 	${RDEPEND}
diff --git a/dev-ml/ocaml-gettext/Manifest b/dev-ml/ocaml-gettext/Manifest
index 7c64f71cb8e3..4555d8a3b798 100644
--- a/dev-ml/ocaml-gettext/Manifest
+++ b/dev-ml/ocaml-gettext/Manifest
@@ -1,6 +1,6 @@
 AUX ocaml-unsafe-string.patch 599 BLAKE2B 22e49acb160c01cfc9eed25bfbfbf45b281ca049c77801a81c2d4a5191c50eea5650a2db2f34df1bd49169fa2bd49dbf957fee57e3fe181ef6c37252df04d693 SHA512 78ba4efdfb0e681c4ab77af7d957de7e56a67cd97557db991ab62ec857f8fa19d374c979b4773d2a9e146db5942ce124c1603aefab065c503ddded38eef9f6b7
 DIST ocaml-gettext-0.3.7.tar.gz 134316 BLAKE2B 9de6ef9e04afbb6001ddc5ef145a687ad88a20eef1c27d3a3e6136f81ad46100cc6496cb66e3edfbf0f7eacfa8abbccb44d846d2f676862c96b8ceb860d8f424 SHA512 1358320359b9d2f3fd97a47d69b2a619942a65605c1e5cbf25e33ef42a10273167b526bca15e6c9523b87d8ea9dfd3215334050ad8eb84a8c41d4feef880a27a
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
-EBUILD ocaml-gettext-0.3.7-r2.ebuild 1359 BLAKE2B 7ec1b27566f101a7e71cef5f63bf498dacc1f5f1452ab00f96b7cc7061964a1e60d4c7ea9e285f1991a8168675ff537ba99f6fbc7f2e65d9bfd185e8cf62fca7 SHA512 1aff6ac57461fe13814c0c905657bdce746f40813c4f0980bc25e98a805dd7007ca9fac5d7856b098c862c55794949702630668078642b871bdbeda88fa622e4
+EBUILD ocaml-gettext-0.3.7-r2.ebuild 1387 BLAKE2B 3ed194dcae360ff403489d550360eeb1f9ad34f5952cb8a15127ead202cb027451315d15e7be802097f9c7ef034006791ff8e6c5774f4541cfee04a42a07d82c SHA512 17c7a4e777e476115b0be95e3238d9fa36299f71d6bc90baeb048ee88d58cd70f56784fc3b74192bb060da633572107c584084a811b0d85acf120fd9fad5bcd7
 EBUILD ocaml-gettext-0.4.2.ebuild 782 BLAKE2B caaa2993e3b8aed055be1a07e6d339332d79f84550f34abc6bb13303d70ba6112613e47bef0136f992589010aa0b2b2b2b4e42701389038777665ed45e679cf8 SHA512 64442e7b6fd4218bfccbcbb1494138ab6e4fac7723b14f8e3cfdafc54498c87803d5d95be0355f22a71329c435a065692d9761b386c0011978307d53240c3ed8
 MISC metadata.xml 632 BLAKE2B d683f2b55fe66ac0ccae90494f7485042652afc9a1c01d583cef1fb9181b15d9a9d66c44eee51fb380318946288e9a05320896f376cc91992115349987ec8466 SHA512 70332af42127e51035802cf05ed4fff1d2ca363ecfe7c43a6db70277e6625de026091f2fc0b98158c283f7e3d9107d898708443121d935f6618ed0d822883610
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r2.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r2.ebuild
index a71acc3dd624..60ff476d5448 100644
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r2.ebuild
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-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=7
@@ -26,6 +26,7 @@ RDEPEND="
 	>=dev-ml/camomile-0.8.3:=
 	sys-devel/gettext
 	dev-ml/camlp4:=
+	!dev-ml/ocaml-gettext-stub
 "
 DEPEND="${RDEPEND}
 	doc? (
diff --git a/dev-ml/ocaml-ssl/Manifest b/dev-ml/ocaml-ssl/Manifest
index d472b159e63d..de0d53cf25e8 100644
--- a/dev-ml/ocaml-ssl/Manifest
+++ b/dev-ml/ocaml-ssl/Manifest
@@ -1,5 +1,7 @@
+DIST ocaml-ssl-0.5.10.tar.gz 33951 BLAKE2B a27cce7e19c3737657cbdba31d919d51d0db137aafddc6397ff018fe36346a8e99b0353c76f4a4bc4dcc7dcf63ec326e87b2ebc809b78de1511963357be280b0 SHA512 f2d0acc8dcdb0a36c8ad236f60c6e9d7f8f76ea25183017218953dbe3432a19de5b0be8214714add71b88b211ac78318f09429d4df7ecba1e19dc94d4414f0e1
 DIST ocaml-ssl-0.5.3.tar.gz 125431 BLAKE2B e95b6757f27fcac16dda1087880bb49ad854108755719210aeeeebd0e14cfee9b6244986f21ddbf86a970ea4b4f9eb2bb8e0a5a888dafe2a7262f004194a26ba SHA512 c0dc38ab21c8adc104a42ec89b8a58de976205887a23a407f1ffee1181d526ddb8aa91877508f8a974c6df8583d6d8611558a995680e313fc78ad0cac184cf52
 DIST ocaml-ssl-0.5.9.tar.gz 32721 BLAKE2B c6b1ec659fddf384005f2cb045c0b0c059daaa93bd782904354e12e1ce63432c04c9bdc823dbfd0cd903ce872c91f0a750975cc69a56c9384ef6d09ed46c22cd SHA512 6826e5a6ab9f51013e8d097900f443d091e085e3d2d232a315a0e3a90ca334c9b9779d20dcae267f9ed961bc4a08fcb80372e669389c59a22d5c7706d37fcd5f
+EBUILD ocaml-ssl-0.5.10.ebuild 596 BLAKE2B bc7c81afc83dd6740a44552024248e974258e9666585ff961aeae0ce6d2a0a8c4abb24509cdd0f921e49c7bc0464e706a06d1779d30d67d6f5388408e0b06732 SHA512 3ca3d8d41474aa7844b7e030e4c46c1cfb28ad3432ebd88dc2e1e370e555a92a5a5d1020b7196726757d685a00c986368714ae56825847056eed12b54b4891ef
 EBUILD ocaml-ssl-0.5.3-r1.ebuild 619 BLAKE2B 183a3abfc50c321e29ad653cbe2055ba45873e621ffbed38d42008cf311ea3575de8209413b5dc91ed1eef8c2f1be9dfc9036b913e6f759293447dc91333183e SHA512 d6421c2302377ceed8b932b3f1e788ec77a53b6bdc9703f90a494b5cdba3a2f26e9eae81661a245a3cc395e5ffff5b0ae03aa78dad0de96597b5ce039b57c045
 EBUILD ocaml-ssl-0.5.9.ebuild 596 BLAKE2B c59b1a6b280d3506168a501dc5bb1162a276c9ea01873ba8a55351a4a9b769617b30f7918cee802370eee91b0bbad11fc1613df3f9da151146425ad8ece6f332 SHA512 e7f6faed62f89d48d15843779a0746f42d3c5b4dd27320695de4c7dc36a2e884bf693784dca6d4f2fccd3f412e2b5fe81f46941282b0a4b13ded5baaa1c62f33
 MISC metadata.xml 366 BLAKE2B 3500b88cfc5c67cc1cea168548db25e3c38b0e821dc9140b68472da7b8f11bedbcd9f9cf1c3bed002e4ce6848e83b2cf2a0531f0f60cd92a605596d5ed8ae8b4 SHA512 0d755921669d45da244c75aea1fdeadc05fca6c98256ba5b2afb8a524b8db705a91127a5e726cbd0f5be329a779a46578c941a93fc801a5ac373a6e8b0bc3e27
diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.10.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.10.ebuild
new file mode 100644
index 000000000000..763f1ceeb645
--- /dev/null
+++ b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DUNE_PKG_NAME="ssl"
+inherit dune
+
+DESCRIPTION="OCaml bindings for OpenSSL"
+HOMEPAGE="https://github.com/savonet/ocaml-ssl"
+SRC_URI="https://github.com/savonet/ocaml-ssl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+ocamlopt"
+
+BDEPEND="dev-ml/dune-configurator"
+DEPEND="dev-libs/openssl:0=
+	>=dev-lang/ocaml-3.10:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dune_src_install
+
+	dodoc CHANGES README.md
+}
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index c409e509bbed..e1cd37315d2c 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/PEAR-Mail_Mime/Manifest b/dev-php/PEAR-Mail_Mime/Manifest
index 1ef11c2c3aa3..955d69e6c1f5 100644
--- a/dev-php/PEAR-Mail_Mime/Manifest
+++ b/dev-php/PEAR-Mail_Mime/Manifest
@@ -1,9 +1,11 @@
+DIST Mail_Mime-1.10.10.tgz 40520 BLAKE2B a552ee3e374e7af078ea1a266793aa88b74cd98a630eeced9ef0525ada9dacd645b9182da91cf39b09e9824672478bc0bfc1d3370bf6d839cf11bd67a3e96cdc SHA512 0d1bd45424ee560961a827bdcc1c93516c6cd7987745a4571224aa42b7cc22c284931ff9c56c7df1371ae1d763449e04da5d4ccf0cc6ad00306c436fc81ae2e6
 DIST Mail_Mime-1.10.2.tgz 36501 BLAKE2B 59e900b99061e84d307eb46d295f843404ae06b01936cec4ed610c298b6f7e8fcee15098fa6d935696122311eae2dbf733611410b2249f2535673a3031011fa3 SHA512 4e3b2a2adc58d8b4f16f56509c9f22638dc37aedf1bec60871706390198198be6ed6dccae8c250eb33de3a441aeb122097ffaddbc49191745f0f09693ec6612b
 DIST Mail_Mime-1.10.4.tgz 36909 BLAKE2B 101d050d96b717ad970a6f8c170ba8ea7d94252274f0b006a266a5ef4ac9d49fb350d3bf120ce645e5a54af1f0ad0ab664c828abfa8a4a96170e7204c73dfd82 SHA512 6e58e1078292cf43605313e2402b60deb97be0b56c8eb5dbbb501cf92ca836ca4bdbc9e1ab878c89f8e59941962a91b73dd917c8e678f0944f271e5537f065e5
 DIST Mail_Mime-1.10.6.tgz 38355 BLAKE2B d12b0496122c67236090db84710aa1fa660570d82952f037ddeb795ac3184a427965e12b21a6dcd6bfaea692299fb6e610822a364470c444455369f96dbbe972 SHA512 223e4a3a3ab52497d7cee551108642aa8c90328cd5d28ec0f215e16e0f2066fbaa3e4d51e62080d322846f8410c2e4641cd7c743e736062b6f8215e637877518
 DIST Mail_Mime-1.10.7.tgz 38445 BLAKE2B 4e990a9a704aa8fd918dcbcd271946cd5a76c55783cfa207a9a8d171c1e0d407e19e2a30ce46689c8afddeee0037082d77ecbc0e3fb0b4e94f82a2b242ef22c6 SHA512 b3ac0076d3519c14f0331b73940a4fa47cfeb1d2c31d5a5ffa820042fc9b56a8b4d479f349dbe213164c157d5c56caaf0b4f70ef422cc3eba40443433c813d60
 DIST Mail_Mime-1.10.8.tgz 38783 BLAKE2B 5a9410dd0778bbd765a6c6f2e7880d2e7951d131c3e2195a840e0b31579fc2c8b722db434d3d104fa3d178e7033cb08d9ac15a9ebfa38911566d5e52a2ddbae8 SHA512 3f32b894ded49fc848650d684d98c9db6394074491a0ef92ed97be01f35ad01aab96845d4bc590034767fcc92631fdf475db3d0c926a000ad7879d6a9ac824b5
 DIST Mail_Mime-1.10.9.tgz 38928 BLAKE2B aa55b61b6b683db8a8ec26c896f38b5c62376a39488dbfb5d56bca3b199086d3057533072fe2070859f12052207fde1f0bcad86b97830e66fef95f5b69381fb7 SHA512 aefaf0501c3876750b567a4d4c4edfb629b51f2a2bcf104705cf938611334bfb587a0cac270eed52c111819dd018199a3907916060b9b9fdbddf5ba143d71061
+EBUILD PEAR-Mail_Mime-1.10.10.ebuild 659 BLAKE2B 3e7e6d8ace1b8eafd6101f106c48e213740e8356329a8a99d9e2f2eace96a92d70768aa6344b9c8e863c9d4e82d3f85696324246214e23baca1d7199da66331d SHA512 ab47671b4f78c3db55d4d80ff4dae3505cd1ebb5b2c90ca7709ee8c1954188e31ba32eb09abbe68d7f4c7ef09726ef0bc08a356d1dc95b7403ac16a050695327
 EBUILD PEAR-Mail_Mime-1.10.2-r1.ebuild 649 BLAKE2B 3af0a72db5ef167fb918774ec68344b8ad8e57d62ec1741cc5344485706ba67e587ac79c13d9887c9e64866278e9562002d60eec3a265eb4da18cc888083d6aa SHA512 8ea3c793c29ec20e6bce3edab106a3fce17256f6b9d4688bba432ff7284f6886093382f3b4a69f79f79fd48718997f2598cc31fd8d9541048b5e4d0638f4dcf2
 EBUILD PEAR-Mail_Mime-1.10.4.ebuild 659 BLAKE2B 5d14d7d28e38dee39420268c0d300a8e50204360fa2e494770e65caf0caec3d90e531462222583f4df1af33e7d387f7b282ed8418af4fe19e1f477720f14d265 SHA512 27ad47c4f1ba14bd930279a9ea570952cd3305d47f770a4713ab312c32fd4666de43fcb1e8b1fcdf1aacc51fd3c72ec05650fff8cff50ea1aaee9c15a5839fbd
 EBUILD PEAR-Mail_Mime-1.10.6.ebuild 659 BLAKE2B 5d14d7d28e38dee39420268c0d300a8e50204360fa2e494770e65caf0caec3d90e531462222583f4df1af33e7d387f7b282ed8418af4fe19e1f477720f14d265 SHA512 27ad47c4f1ba14bd930279a9ea570952cd3305d47f770a4713ab312c32fd4666de43fcb1e8b1fcdf1aacc51fd3c72ec05650fff8cff50ea1aaee9c15a5839fbd
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.10.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.10.ebuild
new file mode 100644
index 000000000000..eb4747a42cf2
--- /dev/null
+++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit php-pear-r2
+
+DESCRIPTION="Create and manipulate mime messages with PHP"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-php/PEAR-PEAR )"
+
+src_test() {
+	# Requires the "pear" executable from dev-php/PEAR-PEAR.
+	pear run-tests tests || die
+
+	# The command succeeds regardless of whether or not the test suite
+	# passed, but this file is only written when there was a failure.
+	[[ -f run-tests.log ]] && die "test suite failed"
+}
diff --git a/dev-php/PHP_CodeSniffer/Manifest b/dev-php/PHP_CodeSniffer/Manifest
index fcdea606f131..18bbc156db16 100644
--- a/dev-php/PHP_CodeSniffer/Manifest
+++ b/dev-php/PHP_CodeSniffer/Manifest
@@ -1,5 +1,7 @@
 DIST PHP_CodeSniffer-3.5.4.tgz 697668 BLAKE2B f5915bcb73c0db0d8dcab3eda5ab647268888e490d244568f0d0e7fff38c4764cfe62fcc79dabe8095adcef56b1e6d0367d46c36b18d0c4e0fb04a048c697737 SHA512 3e8024aac18111741637f014629eeaf5863b2f080a673e5b379a676fafb69859d1889ae13289b0149a9810641b0a140123a970ae1178fcd2cf6da1c414233bfd
 DIST PHP_CodeSniffer-3.5.6.tgz 706080 BLAKE2B 1d9d097e7c60f520973a0dff16e6b31c9e259599ded3f58ac6dda2f10419969b03c18d1ce7c38f19a0f3474b0d5cf4afc5abb889f820da0d5d9e8f0574a0a354 SHA512 392c162cc8cb8d8fe455990d7f358cc59f486d8083387dc3bf60af6ca7aa0e75b72ed337f624b08948d8060cc96bd2d03373b7508fb9179da6a4e6b83adf06a7
+DIST PHP_CodeSniffer-3.5.8.tgz 716472 BLAKE2B e56efedc07a9db63eb2f135d9fef69bf055cef09c23dd9cd1e0efeed865d559b428e9aec06393b1ec1f58d32add92b2773c3d9ce33377f2441de0145560045a8 SHA512 69ef3d86520f541f492c955bd8158664c78aac6ecd4550f2b996f59d882d91f1bec81da9bbd106edc35c4f1a4c260ef2d9a56ec257fc0b4044047b902403065e
 EBUILD PHP_CodeSniffer-3.5.4.ebuild 1502 BLAKE2B 02a3242341c9006a02cbaacff2a5f4b4eb6cb0d9b680c8ba3102316503c7bfb0bcc7be7799fcf4134991010f94ced0cd15c7b8e468c84f707b2904fa64a8b57f SHA512 c3cc91615ce68a44868765c66a8b6f45bcf93e8ed79f74ba9909249797b79c18565baac9ee98a0b1941fdd0a081f568c6a64a47d1cc328346585e0896f909b19
 EBUILD PHP_CodeSniffer-3.5.6.ebuild 1445 BLAKE2B a7d29b2211a6db7ba565908923e1bfedf6cf4f97d0f64374a34237ff854f3c7a1f29182c41a1b1199ea6de8337092af01eefba5f760c211e8e8df21ec10f8f6f SHA512 2ba7d933623e6d552c1676ff2a8e3b8cd407be3e365921b24a0cbe56875883d951cda7d9afee7dee044403ca94de6ab2f592c18337e0af4ca16fa950b6b381f3
+EBUILD PHP_CodeSniffer-3.5.8.ebuild 1450 BLAKE2B cf406c2ceb6ee7cc5556cce50962e30cc185f62319d9407264077bffaa357bf9aeb4b5440a8edc85c2bc1496f654f1c8e734e81367b17fb4356e0571dcac90d6 SHA512 5a94e1232ddbc0ecdcce41f016a7167405b8b71c309a18833e429a66939f8dc6fb076842c40a0e407ec2927aa2a106d10ab0bd57bad8d3abeb3619666096d271
 MISC metadata.xml 329 BLAKE2B 786efd240520e1b8b5ec8fde8fe4772defb0dbae2bf69358710c227454f5de1bc831600eb81d605053163d78e0129cd657b3229a74d30bcec7ffe6ce960d87d8 SHA512 5a983e0b393c626d49f7b3b8757cb68e73a7f292ebc861ca5e6f83c20b5c6f79918422aee7830ad3dccacda719c6d42d6bfcc5eb7ddca7ed29785ef1dd9e0f30
diff --git a/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.5.8.ebuild b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.5.8.ebuild
new file mode 100644
index 000000000000..ee16c9322ac2
--- /dev/null
+++ b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.5.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Detect violations of PHP code standards"
+HOMEPAGE="https://github.com/squizlabs/PHP_CodeSniffer"
+
+# The test suite isn't part of the Github tarball at the moment. Keep an
+# eye on https://github.com/squizlabs/PHP_CodeSniffer/issues/548
+SRC_URI="http://download.pear.php.net/package/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-lang/php:*[cli(-),tokenizer(-),xmlwriter(-)]"
+DEPEND="test? (
+		${RDEPEND}
+		<dev-php/phpunit-6
+	)"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_prepare() {
+	sed -i "s~@data_dir@~${EPREFIX}/usr/share/php/data~" src/Config.php || die
+	default
+}
+
+src_test() {
+	# The test suite will fail if date.timezone isn't set in php.ini.
+	phpunit -d date.timezone=UTC tests/AllTests.php \
+		|| die "test suite failed"
+}
+
+src_install() {
+	local MY_PN="PHP/CodeSniffer" script
+	# The PEAR eclass would install everything into the wrong location.
+	insinto "/usr/share/php/${MY_PN}"
+	doins -r src autoload.php
+
+	insinto "/usr/share/php/data/${MY_PN}"
+	doins CodeSniffer.conf.dist
+	# These load code via relative paths, so they have to be symlinked
+	# and not dobin'd.
+	exeinto "/usr/share/php/${MY_PN}/bin"
+	for script in phpcbf phpcs; do
+		doexe "bin/${script}"
+		dosym "../share/php/${MY_PN}/bin/${script}" "/usr/bin/${script}"
+	done
+
+	einstalldocs
+}
diff --git a/dev-php/adodb/Manifest b/dev-php/adodb/Manifest
index e44f5a4b2912..c5fffad39512 100644
--- a/dev-php/adodb/Manifest
+++ b/dev-php/adodb/Manifest
@@ -1,5 +1,7 @@
 DIST adodb-5.20.14.tar.gz 465896 BLAKE2B acd8494141584b0c02c2e30aa59b3916ae811b8095ca724d22f44ed2cb1456b8e8afc7ff9af41e7476f4a93809e762c44a175fd3775b69654107813342b3a47a SHA512 fa9b764742f3edf15e79da7a34ca52b19f51454fa20bc963cce963cdd40f7e78671e993cd672a21e9917aa2440c63601fbf768b5259dccb64b458a5be6f4b0eb
 DIST adodb-5.20.18.tar.gz 467003 BLAKE2B ea0b007359a4fdada0fface3d5af82c335f2e7efeacdbb66be37914d76bff2783b58b2318531c527d13c3c358800803385c660c8f9372cf4a49269ed7e0c7d51 SHA512 09b04987e20a674a202be3889523b3bada578ea01f07830fed15afafb046687004b4e305a6abf2af795a7b0e3563f6e8afec5b0189f21e5c74b5e84bfbee1cd9
+DIST adodb-5.20.20.tar.gz 469337 BLAKE2B cffe367e498978b095e28bab565c8af7e02769e4c76977fae7d807c6326d9b4679e319fa84debc9b250d0548e7dcac2e078b4968160490831e2390ce86fbe229 SHA512 2578a594bf9f1b33b5a78bd3e52b9fb73d0457b021a2bca6b5f8d311c0ecb347968a928a1dabd2c8806972dda6ec535fec94d6f792b6f5398aeff587321e5113
 EBUILD adodb-5.20.14.ebuild 1446 BLAKE2B ae4189f84a9e1d0b94f1d365504c9d9982ee2e6a8475f39b897ef7b6b544e01039b572a54ff062e853af45e60d355d5f389a836b7ada6df629f741969101b72b SHA512 60ec66bd4b94e70a13a4bc331dbf042c21c0ad4ecccb4582b5167a65d553b98539ea2afdf27c2f658c3a3e95f857ea8e6c3abd795107c1465c2e49c2e9eb4919
 EBUILD adodb-5.20.18.ebuild 1452 BLAKE2B aa01cdfbab7c732279973480c2524c8c13668b54c85f8396e205d54f849f8e43a553b6a8325743dc8a17f088317397457a4a3f8e3a3bebaade4515965123fbf1 SHA512 9af2be6f93b6c9d1610393c3fda939b30993ac7121c286541d2e52035b4c084c2034f2bb9c45db1affcbd0f194974276464679c808b3c6d7895b6d16cbea1ccf
+EBUILD adodb-5.20.20.ebuild 1477 BLAKE2B c75a324745a1347176758993809b5bb5b9859221cfe6846135b0b43cf0cdb28898f03c2635013eb0ae507a39ad6887c011d880b639426c3a4bf77f04cf3d4b07 SHA512 0403b784e49f1d1de81dc7b65568ea6ed624542a81f84d8016c7988143714f027dcbd393f16749e3b040378e984548afceb72d2e23b75697f7560b58ec41b391
 MISC metadata.xml 490 BLAKE2B fe6674acd3eb6a1c95ae4deb6f4215b0c31251918cc96eef1d6c784914d8e3c7eb273b868b90d7b8585421acb58172b7ce6a54d99b6b41abfed923b6e34abfd3 SHA512 c81b170a7a9532e27707f6bccea90be62a8504228571eae8b5564eea37c6789bafcb2681e4de8cc99916e1304056121575c3d8487cc1102f13909d14a7565fcb
diff --git a/dev-php/adodb/adodb-5.20.20.ebuild b/dev-php/adodb/adodb-5.20.20.ebuild
new file mode 100644
index 000000000000..7ed5d8ba45b8
--- /dev/null
+++ b/dev-php/adodb/adodb-5.20.20.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="ADOdb"
+DESCRIPTION="Database abstraction layer for PHP"
+HOMEPAGE="https://adodb.org/ https://github.com/ADOdb/ADOdb"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+# If you want to be picky, we should require that PHP be built with at
+# least one database driver enabled; otherwise adodb isn't going to be
+# able to do anything. But, the database USE flags for dev-lang/php are
+# a mess. What we would *like* to do is have a set of USE flags for
+# adodb that then propagate to PHP itself... for example, adodb[mysql]
+# could require php[mysql]. To do that would require that we duplicate
+# the database USE flag mess for adodb -- not desirable. Instead we punt
+# and let the user install adodb unconditionally. If he doesn't have
+# database support in PHP, it just won't work.
+RDEPEND="dev-lang/php:*"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	DOCS="README.md docs/changelog*.md xmlschema*.dtd session/*.sql"
+	DOCS+=" session/*.txt session/*.xml pear/auth_adodb_example.php"
+	DOCS+=" pear/readme.Auth.txt"
+
+	dodoc $DOCS
+	rm -f $DOCS || die "failed to remove docs before installation"
+
+	insinto "/usr/share/php/${PN}"
+	doins *.php
+	doins -r contrib datadict drivers lang pear perf replicate session xsl
+}
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index 5995b7682fb6..6aede94970ec 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -1,22 +1,9 @@
 AUX autoload-r1.php 973 BLAKE2B d01d694be6f50af0e995dc24da1545b666609ce0098b4206a1843b249fedcbf983f1826a3158e98ad7cfe675057b12fe52ff82b6b66e2d582ccf983b929c2f90 SHA512 06f9e2862521c54b765f55fe1c1e02728befd296916d0f41357d4e6004f2d00ddaa533ed5210e92e4642eb548a2d5fabf80604fc09ef7e871742716f4c02d112
-DIST composer-1.10.1.tar.gz 421852 BLAKE2B a40f59ab0af5eba777f1926bab78e55fd1973e53b324eec73fdca70678fc1cfe6f892790a61a66dbdbe07caa03343bfd109318daec99c2c18707785c6bf149e0 SHA512 ebc3ee48bf0d2597e7221e9ac0ab7188e7a99096d5dacdee4176b4c7b4d252d079c117b5bd9131ff38d8963f95930fa9c83fa51ed542d4f7d58276561de1f2b8
-DIST composer-1.10.10.tar.gz 426836 BLAKE2B 46266e0338e4bad201d6f025ffb3ae6a4441543cb6aeec27502e43127cb6e109a2824960f774d2996b231e469639a6fa6f58f831e82f6a7313364049ddb626e7 SHA512 a859026dc2b6dc5f3bf8a03f305b7eb59339bc13148036c3b23c24a1136cc53c50217277d8877987e441e3de80d97d771d014f2a60e76bb09513827be2ce71e7
-DIST composer-1.10.13.tar.gz 427175 BLAKE2B f81a108028f8697af9f1e624681fd924d30daa9e7d3b4ec7a6661c517393aa2c33f964b85b73824d24e023acbe0c8ce835b6c3897084b1112fd606c27d7fcf97 SHA512 f16baf2d063ea30b0099f604998857e027b3e2c0c8fbf62aee735d721788e2316261414785ee99945c254ea1e82fc37f72a2b83ee817ecf3aa6521c311e4c53e
+AUX autoload.php.tpl 253 BLAKE2B 421f8bd3aa659c6add54e46094ee1d8806ab4fd33ee915515fbe94d241b6a1d5f222b85a720733c5e48369f3a737d5696cf4f8343df7fe809b3a7e4ec38854a1 SHA512 0cfa3e377406d7eada27c56c50b57943b096ea35ec23b2bfe1c926bc4eb276151578d3cfbfa28c76b3358875db35b9e2460204d50571da2d3df6d9a665514da9
 DIST composer-1.10.15.tar.gz 427919 BLAKE2B 38d2e1c795385dd13bedbf5283cf76b04efb54db8dc72eff05370b9505382e2e43f10e1528f148186edb759a098b948d1fee36ac99ab6a5591858723100a27aa SHA512 f8544632e00a08ec75b327e6eac2c96bff60ba78c238863c8ab6b4d82239997f11140a049df0d6c0338bb7523b52fc3ea6f767b9418f75b51535ccfde44fa68c
-DIST composer-1.10.5.tar.gz 423065 BLAKE2B 0c8595f3583a692f89294455984aeff2ad9cbf2a39541355cbb736e717baacae8245fa81e6b9fde11dd5bb56ad3a074262f6f8ecb65b4bef9c782ef39887deec SHA512 cdadb2d146afcc140316b83d3b4f4c018d79e8222f6a6207cdd52db75ae9c78e787a509d88a3fe113f8218df2ace56ba2dd043e1b6e6c3dbb5129fd51d8e9925
-DIST composer-1.10.6.tar.gz 423789 BLAKE2B 74d93e769c660f2c74e0ad5dd3ed5e5279c217552eb6d342ffd43d7fba10647865ade7b284c811f63504e0335e5655eae681cf14ae4d876eb56ff6a306c61268 SHA512 fdc209a82d3adda2728190282327b02d2b71bb9b1a80cbcda3699a826ee56451c997edac13d76e2784ebd4297d413bd46dd47b9538accd4bfe6c569464696779
-DIST composer-1.10.7.tar.gz 424264 BLAKE2B 9939e4d1f29071ca4467076c13e0ceab32d10282876ebb0a76f41dd3efbd9c40a50dbf278dd0a12b2119d40ff9424c171f07381fbaadb94218b1fdf69f403fdb SHA512 81ece3314cddced101b0be491e40b60d42ef503cef4b1d5598c32f3378f10524004a7a8ef4360453a4cdaaf9d3b986ce07696de075dc424deae7703945f6d577
-DIST composer-1.10.8.tar.gz 424875 BLAKE2B 5ce0e9f6b2345900640808df5233a8dbc959ba7421eda038d939e426ea5af67c236acad21d15c392bfc413187ea2611d3c587bd6f25b4e7de503b4832e4da54a SHA512 a891dca203667a63b722cd0fa8c05dfe12b07b17addad7ee94ae1db0d0887ce5fccf35985fb8fa3af5f98d2bb8df9cb2e4b9ce386c07617cf8a413b21621983d
-DIST composer-1.10.9.tar.gz 426433 BLAKE2B 160540a589469a41d470ad455a450ec5424548d1f215adf3ac71a629226fd2432a10fb0d9146dff4797a714e32ba276777f4db86f3ea86019b9792df6ba0da39 SHA512 e8dbdba3b1130a594703c74e6f12d30028247d54e1f08b5ddd904186645da2bbdbfb5b39fbf3098488f413b2311fee101bbbe9fb5ea02b7363a6ed1c28422b9a
-DIST composer-1.9.3.tar.gz 412212 BLAKE2B fc293a38baaf87cc2581304e1438d48e94a85ca2c5da4eff388b1307dadacb67327d9612211af70f1734872c7a377b8713492839c2d330c9e0e7226206cdc1f6 SHA512 42a37b2187895e06f2dc8c5225a1328377afc408ad28af12d9ef5d15fe083dcf22459ce0f482abfd528683113af5f9fd1a19758294c59c69b59a5bb32e65f2cc
-EBUILD composer-1.10.1.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
-EBUILD composer-1.10.10.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
-EBUILD composer-1.10.13.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
+DIST composer-1.10.20.tar.gz 429016 BLAKE2B 29dcf1e32974230075e56c9b11e53316a1bada9a6ccf43f3357fc39577abadde566df962bb9bf92cc9806a012fbd70c18aba5daee87090fd10de273643d92ce7 SHA512 5b85ebc6a0612c01bd2dd6f6a57526581a821c1a45163ef85511bd0e629b10dc464776b56fe33be192b2a3f07ce818dc40cf2305d9f65ee10287b2265e198cca
+DIST composer-2.0.9.tar.gz 493134 BLAKE2B f08818ec05aeebd79501e221b9cef10425c7dd60b9aca17ca8dad2f6967258d6b1a8d0d1b383b0c7dd1214ce6416f666bc30785bcb5978c66051ef2e03d17304 SHA512 4953bcc0d2e9ae61ebbb3615c262ac05762fa0165db2114118eb5c2bb014bc4341b07c3b8739575feacaad92d2460b89486b49f4eb49b80ce4a9de36a1152b48
 EBUILD composer-1.10.15.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
-EBUILD composer-1.10.5.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
-EBUILD composer-1.10.6.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
-EBUILD composer-1.10.7.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
-EBUILD composer-1.10.8.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
-EBUILD composer-1.10.9.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
-EBUILD composer-1.9.3.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
+EBUILD composer-1.10.20.ebuild 1233 BLAKE2B 8ca659735c9256070bdf634a96eb790a23ef4a5f6e9bc1c4d488d2082d97d87a043b8becc944f9e33479516b40c29b2ddd93c7fe4219c1a3b143c333464b160d SHA512 5cf952c3bda93befd1a77ed5330905f3be8bddb254cdb3d52c6ea6c24eba0bfd32cb936fbbbe18e18dcdf1362b5e423b45f47346f1fd5e5192753c66f51e00e6
+EBUILD composer-2.0.9.ebuild 2103 BLAKE2B d46051503b70b8c5f27b4d6b7310cccf74afcc2736194ea1dbb5a42d6aae193406c466e6b6f79f0a0e0573e73131b8c780d28680daa9b9ab8a462cf7deaa97ea SHA512 dbb17d0d0b34d31ec6c315e3c6e21c3e355237eabafe94568188620da5e0d706a5fba97c74a29408b4fdf9d87912574e96aecd52a020fafdd917f966b46e7e62
 MISC metadata.xml 774 BLAKE2B 8a1f75c0c7da6f0d193a981c6db3888d62e2223b6368c4a7dece62ae33cc9a2a8c0b34714170462f262569954e70cc9b976012ff864ccfa36a46da3c719169ae SHA512 1a17bfae65923a3bea593c57d7ecf4fb2aeef43d0537636105e52294de295cbfeaed4b3c36ffb8675a563f657f4f969e62096cee20b9ab178c962acf2f68ac3a
diff --git a/dev-php/composer/composer-1.10.1.ebuild b/dev-php/composer/composer-1.10.1.ebuild
deleted file mode 100644
index 29915836e3cf..000000000000
--- a/dev-php/composer/composer-1.10.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.3
-	>=dev-php/psr-log-1.1.0
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.5.0
-	>=dev-php/symfony-console-2.8.48
-	>=dev-php/symfony-filesystem-2.8.48
-	>=dev-php/symfony-finder-2.8.49
-	>=dev-php/symfony-process-2.8.48
-	>=dev-php/xdebug-handler-1.3.1"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}
diff --git a/dev-php/composer/composer-1.10.10.ebuild b/dev-php/composer/composer-1.10.10.ebuild
deleted file mode 100644
index 29915836e3cf..000000000000
--- a/dev-php/composer/composer-1.10.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.3
-	>=dev-php/psr-log-1.1.0
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.5.0
-	>=dev-php/symfony-console-2.8.48
-	>=dev-php/symfony-filesystem-2.8.48
-	>=dev-php/symfony-finder-2.8.49
-	>=dev-php/symfony-process-2.8.48
-	>=dev-php/xdebug-handler-1.3.1"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}
diff --git a/dev-php/composer/composer-1.10.13.ebuild b/dev-php/composer/composer-1.10.13.ebuild
deleted file mode 100644
index 29915836e3cf..000000000000
--- a/dev-php/composer/composer-1.10.13.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.3
-	>=dev-php/psr-log-1.1.0
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.5.0
-	>=dev-php/symfony-console-2.8.48
-	>=dev-php/symfony-filesystem-2.8.48
-	>=dev-php/symfony-finder-2.8.49
-	>=dev-php/symfony-process-2.8.48
-	>=dev-php/xdebug-handler-1.3.1"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}
diff --git a/dev-php/composer/composer-1.10.5.ebuild b/dev-php/composer/composer-1.10.20.ebuild
similarity index 94%
rename from dev-php/composer/composer-1.10.5.ebuild
rename to dev-php/composer/composer-1.10.20.ebuild
index 29915836e3cf..d8c51c550e91 100644
--- a/dev-php/composer/composer-1.10.5.ebuild
+++ b/dev-php/composer/composer-1.10.20.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
@@ -18,7 +18,7 @@ RDEPEND="
 	>=dev-php/ca-bundle-1.1.3
 	>=dev-php/psr-log-1.1.0
 	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
+	>=dev-php/json-schema-5.2.10
 	>=dev-php/jsonlint-1.7.1
 	>=dev-php/phar-utils-1.0.1
 	>=dev-php/semver-1.4.2
diff --git a/dev-php/composer/composer-1.10.6.ebuild b/dev-php/composer/composer-1.10.6.ebuild
deleted file mode 100644
index 29915836e3cf..000000000000
--- a/dev-php/composer/composer-1.10.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.3
-	>=dev-php/psr-log-1.1.0
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.5.0
-	>=dev-php/symfony-console-2.8.48
-	>=dev-php/symfony-filesystem-2.8.48
-	>=dev-php/symfony-finder-2.8.49
-	>=dev-php/symfony-process-2.8.48
-	>=dev-php/xdebug-handler-1.3.1"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}
diff --git a/dev-php/composer/composer-1.10.7.ebuild b/dev-php/composer/composer-1.10.7.ebuild
deleted file mode 100644
index 29915836e3cf..000000000000
--- a/dev-php/composer/composer-1.10.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.3
-	>=dev-php/psr-log-1.1.0
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.5.0
-	>=dev-php/symfony-console-2.8.48
-	>=dev-php/symfony-filesystem-2.8.48
-	>=dev-php/symfony-finder-2.8.49
-	>=dev-php/symfony-process-2.8.48
-	>=dev-php/xdebug-handler-1.3.1"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}
diff --git a/dev-php/composer/composer-1.10.8.ebuild b/dev-php/composer/composer-1.10.8.ebuild
deleted file mode 100644
index 29915836e3cf..000000000000
--- a/dev-php/composer/composer-1.10.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.3
-	>=dev-php/psr-log-1.1.0
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.5.0
-	>=dev-php/symfony-console-2.8.48
-	>=dev-php/symfony-filesystem-2.8.48
-	>=dev-php/symfony-finder-2.8.49
-	>=dev-php/symfony-process-2.8.48
-	>=dev-php/xdebug-handler-1.3.1"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}
diff --git a/dev-php/composer/composer-1.10.9.ebuild b/dev-php/composer/composer-1.10.9.ebuild
deleted file mode 100644
index 29915836e3cf..000000000000
--- a/dev-php/composer/composer-1.10.9.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.3
-	>=dev-php/psr-log-1.1.0
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.5.0
-	>=dev-php/symfony-console-2.8.48
-	>=dev-php/symfony-filesystem-2.8.48
-	>=dev-php/symfony-finder-2.8.49
-	>=dev-php/symfony-process-2.8.48
-	>=dev-php/xdebug-handler-1.3.1"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}
diff --git a/dev-php/composer/composer-1.9.3.ebuild b/dev-php/composer/composer-1.9.3.ebuild
deleted file mode 100644
index 29915836e3cf..000000000000
--- a/dev-php/composer/composer-1.9.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.3
-	>=dev-php/psr-log-1.1.0
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.5.0
-	>=dev-php/symfony-console-2.8.48
-	>=dev-php/symfony-filesystem-2.8.48
-	>=dev-php/symfony-finder-2.8.49
-	>=dev-php/symfony-process-2.8.48
-	>=dev-php/xdebug-handler-1.3.1"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}
diff --git a/dev-php/composer/composer-2.0.9.ebuild b/dev-php/composer/composer-2.0.9.ebuild
new file mode 100644
index 000000000000..dfdecde74bed
--- /dev/null
+++ b/dev-php/composer/composer-2.0.9.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.0
+	dev-php/fedora-autoloader
+	>=dev-php/jsonlint-1.4
+	>=dev-php/json-schema-5.2.10
+	>=dev-php/phar-utils-1.0
+	>=dev-php/psr-log-1.0
+	>=dev-php/reactphp-promise-2.7
+	>=dev-php/semver-3.0
+	>=dev-php/spdx-licenses-1.2
+	>=dev-php/symfony-console-2.8.52
+	>=dev-php/symfony-filesystem-2.8.52
+	>=dev-php/symfony-finder-2.8.52
+	>=dev-php/symfony-process-2.8.52
+	>=dev-php/xdebug-handler-1.1"
+
+src_prepare() {
+	default
+
+	mkdir vendor || die
+
+	phpab \
+		--output vendor/autoload.php \
+		--template "${FILESDIR}"/autoload.php.tpl \
+		--basedir src \
+		src \
+		|| die
+
+	cat >> vendor/autoload.php <<EOF || die "failed to extend autoload.php"
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required([
+	'/usr/share/php/Composer/CaBundle/autoload.php',
+	'/usr/share/php/Composer/Semver/autoload.php',
+	'/usr/share/php/Composer/Spdx/autoload.php',
+	'/usr/share/php/Composer/XdebugHandler/autoload.php',
+	'/usr/share/php/JsonSchema/autoload.php',
+	'/usr/share/php/Psr/Log/autoload.php',
+	'/usr/share/php/Seld/JsonLint/autoload.php',
+	'/usr/share/php/Seld/PharUtils/autoload.php',
+	'/usr/share/php/Symfony/Component/Console/autoload.php',
+	'/usr/share/php/Symfony/Component/Filesystem/autoload.php',
+	'/usr/share/php/Symfony/Component/Finder/autoload.php',
+	'/usr/share/php/Symfony/Component/Process/autoload.php',
+	'/usr/share/php/React/Promise/autoload.php'
+]);
+EOF
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r LICENSE res src vendor
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-php/composer/files/autoload.php.tpl b/dev-php/composer/files/autoload.php.tpl
new file mode 100644
index 000000000000..b740c5593c25
--- /dev/null
+++ b/dev-php/composer/files/autoload.php.tpl
@@ -0,0 +1,12 @@
+<?php
+// @codingStandardsIgnoreFile
+// @codeCoverageIgnoreStart
+require_once 'Fedora/Autoloader'.'/autoload.php';
+
+\Fedora\Autoloader\Autoload::addClassMap(
+    array(
+        ___CLASSLIST___,
+    ),
+    __DIR__ . '/../src'
+);
+// @codeCoverageIgnoreEnd
diff --git a/dev-php/doctrine-instantiator/Manifest b/dev-php/doctrine-instantiator/Manifest
index f8959eb9f75c..01d56b41e08b 100644
--- a/dev-php/doctrine-instantiator/Manifest
+++ b/dev-php/doctrine-instantiator/Manifest
@@ -3,8 +3,10 @@ DIST doctrine-instantiator-1.0.5.tar.gz 10202 BLAKE2B 77ab3fba96672f6aa282600251
 DIST doctrine-instantiator-1.1.0.tar.gz 5343 BLAKE2B 73f737f19c8ae7a3fa9a7dcaa760246da6d688e28f15be0c40e031be8147887885bba2ec0a7770ead7de7b718247108b41b4c1d08712137c9c06911bde263176 SHA512 7f59dd7f80df02fd1e46f4b0ecd8488022b34933effddfc40d3424b279a35928adfc0fb7567172149338a8d4273b24305eaa46fc51aa0af45a7b230646354f09
 DIST doctrine-instantiator-1.3.0.tar.gz 6299 BLAKE2B 6eb41562f52965381a780243475bda73a921d44784a66cf23816dd228efe4299d225f0cd52a4625a3516d8ae22b7f691a2724b477b944211e8d1ffd2c4c90540 SHA512 989b14bb28f75d091243dd5833a0a7c91889b45a1fcafb425b38de223485aae4470e1f1877b024ca58c5cf3539f8b39ef337166dbbd664bede7a5f3adde623a9
 DIST doctrine-instantiator-1.3.1.tar.gz 6328 BLAKE2B 1854e188cb39131a7ad02698d8a43c2eb84f7ec0239c04f973a7e66913664d49d4e89a09c1ec74b07ef87ecdf3dadb3c61140dcc3727556c44d65d8c022cc821 SHA512 eb5de9d38d45de3306d5481a747ae8164199aff222a52ce9d0fb2c2d18a082c7cf48ea3d670ff81d63c5fe8c2a855c583168a3d810ee9d4bb48d23505aaa80c3
+DIST doctrine-instantiator-1.4.0.tar.gz 7760 BLAKE2B 2e2f4822d0509dcfbe87036107643338eb7b740cd257150c3e6e5149aeb543e2283b3616ef261d048f2e5800c869a5be0db0192e135e944d5c03c2bea1422316 SHA512 f760d1717683bb3f3bacf2a8da31aa842bb623bc7fe2bcd9dcaab71389546da6f4f50a4e35e483857ac32f9a0d58493e74d0459d5bc49595a47f4523da086aca
 EBUILD doctrine-instantiator-1.0.5.ebuild 691 BLAKE2B a8ce75824063f1cc6413a95a8cbdbf6dc503b3b76b61250b3cd2040b56f576656a6a9b14cd0d98f394ac0ebe14dbb1a9a1fa36a6fa771ca88e87bad5bbe1c712 SHA512 910b9978400ac2721e377be1da36f6c8e5d6ff3f0081b6e4868ed53041b7c79f505cd3b1e76be17c18baf5421ff15db39c6a8a316ca1a34c7a57023eaf7dbdb0
 EBUILD doctrine-instantiator-1.1.0.ebuild 697 BLAKE2B 71bf053159eb6c319c443d2312388d4ff2aa763f1c59f36b3f69cb00c5b775ae2d8a75f8497b35a182505e65872b7941a90c59ad941b1082b74c6f6ea1d5bef4 SHA512 faf9997e0a6c727c1ec3d3e4e8b3026f6dc8098b34add642f53d1670a2b47e30fc245bb5d0e21c651046837b0cac9dd6611c91bceb45c7a7f4373b1d47617687
 EBUILD doctrine-instantiator-1.3.0.ebuild 697 BLAKE2B d649a6ae7e681c1caf12860c61eb8380c4b5b11b4b41f7a20c441643b24102808cad942df3530731cdc4a48b6a00883b97cf76c81210f21c8c13a19f2e10a777 SHA512 457bc64ede2268c0c7af6bd7e748183587dc821a9ed138b300687c25b54fef9464d10b5c1af2e3a63d095110c2324973a7cc2c73c4b5ab28a9ae920e88517e86
 EBUILD doctrine-instantiator-1.3.1.ebuild 691 BLAKE2B fa8b507d7101f0df1dbf8bb8d8e72157e1bca5acae40ddc811cddb55d05c9c2e7528f9e4ecf210c822f7b48775d4dd1212ef7d03124bb5d084142ffaddb8ce0f SHA512 698174458102f27a52279a0ee310ce61747d5f9c7689902de73b18143effd9ef48891faab77b956bbd5f832ed6bd2b493fe00d7f7ed9686b208311c7bf885eeb
+EBUILD doctrine-instantiator-1.4.0.ebuild 816 BLAKE2B e101e961c66c3766310f29dc90b271bffb87c23fa838a7a750490c2b9f9447ad50c1854f84fa54319c6ee9057de9d822f8446065c6cccc8a60ab01c034e69704 SHA512 a48711d3efc2b3e4be11fa7fd1c21beac92e6eb773f0905acedd28cf9562bd54c6118f733bf0bb88b70efa18af268506d4707430453399f91021c7cca9b0962e
 MISC metadata.xml 349 BLAKE2B 14a8d6114be042ef2172a8dacec2a303ec4414cb0dd83f6e503919b51f40887f2e447160df2964b04d9c5542ca989b1236258fce3ef4250b9dc17307deb75afe SHA512 16a380830b6e002a090fa981659ba9b75244ee46089d041380e9a289309ac97ff41be35847bd5753f816efbc58d534b9b1a383983f946c2d744e24d9f54aa612
diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.4.0.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.4.0.ebuild
new file mode 100644
index 000000000000..2024f91b3039
--- /dev/null
+++ b/dev-php/doctrine-instantiator/doctrine-instantiator-1.4.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/doctrine-//}"
+
+DESCRIPTION="Utility to instantiate objects in PHP without invoking their constructors"
+HOMEPAGE="https://github.com/doctrine/instantiator"
+SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="dev-php/fedora-autoloader
+	>=dev-lang/php-7.2:*"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	phpab \
+		--output src/Doctrine/Instantiator/autoload.php \
+		--template fedora2 \
+		--basedir src \
+		src \
+		|| die
+}
+
+src_install() {
+	insinto /usr/share/php/
+	doins -r src/*
+
+	einstalldocs
+}
diff --git a/dev-php/jsonlint/Manifest b/dev-php/jsonlint/Manifest
index 288690ac6652..f4c2e02be76c 100644
--- a/dev-php/jsonlint/Manifest
+++ b/dev-php/jsonlint/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 262 BLAKE2B 0394eabe0e8bc08b09cc637e514aa49dee2b83b9c424f0d767a67f75024a86a20bbe63d30fce00cb17b69ee3bd6c74cf310e16a004720fb25aad1e1c65ba82b9 SHA512 476263a08ab0137aed1bb71446f1a66a618247f9095b138b958464f4f47faf775f4bb2ecbe87efa34ff56fb386351e3a3de0dafdf7367c461f0db0717ae5d46e
 DIST jsonlint-1.8.2.tar.gz 13729 BLAKE2B 80cbe2e1dc6bcbc0d75d04f34a36deb8b53ebd78bc4dcff0dd1195549ae2eaa02360b642d91c6a848cba9a3f502ed0618937c149663d6d0c9c7ad0f33897b7c1 SHA512 675ae7bf6cddd83bb2fab60f4c2ac4a8b4bf0068e630f266511a1805682cadefc9a44006623448364ceb73c5e211739787643d9196794349b992cca4d5fc737c
+DIST jsonlint-1.8.3.tar.gz 10588 BLAKE2B af54e4bedb66e28f61c338f5161109cf1df45dc4aea7c5ab27d728aa4ca6cc0c1e76575527abffc0a1ff8b52465cee40935829f71b3b1a0284c0512827b5bc3c SHA512 c2a9a16e9abc048a1899e51cc78995410b8aa44d5afdab30930f7a7d88b174844ac0f547b0d0da83bc4a71ca0457392e586afbc97cef5de36e0dc2e032732bfc
 EBUILD jsonlint-1.8.2.ebuild 887 BLAKE2B 0743d13b44a4a5b8c203fbed8c0080abe564f59e1b5951339b588c2e33df9c356e1622b8c2104abdf89bbb78d09f47fdce25508809b121abc3517f6da6fee994 SHA512 086309631776a66ee68a796c0dc791722374637bd06d971e92aeeb401b5b302dc9e04708004c1067fe4dc698838aaf853a405c297805de19fcc7bc46a37b88cd
+EBUILD jsonlint-1.8.3.ebuild 662 BLAKE2B b3bf6c6552b0fbf1023b64a40e1cec1047d7c9a6878cb9e7a509aed1d45c1b96db71c04a7100e83846b67ed2682021def5907332b91949ebc780551c954b12d5 SHA512 fe8bd10910616bc5857e739d7a67c07b4ad16dfa29efc9492f0088be32b8b835eb8507f96406c6ad72e333ffdad5e597d8caaacf9f4c1651e4c03e7ad738926e
 MISC metadata.xml 554 BLAKE2B d3e5440418af5ffa8bcf2188f4733fdea1f0b352482b36611f97e3574dc8046dcaa492961d9934215656ce954e7a20506f5208df1c09f052fd7cf06f83538c9a SHA512 78495ee38c55d98dd9368ea8f185d4c0a19f98b49da20aa9721c975d4df4279fe4df842fe55e351ebf1280569172be0877705266d2cfb90e0c52f3374506595e
diff --git a/dev-php/jsonlint/jsonlint-1.8.3.ebuild b/dev-php/jsonlint/jsonlint-1.8.3.ebuild
new file mode 100644
index 000000000000..5882c9617f68
--- /dev/null
+++ b/dev-php/jsonlint/jsonlint-1.8.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="JSON Lint for PHP"
+HOMEPAGE="https://github.com/Seldaek/jsonlint"
+SRC_URI="https://github.com/Seldaek/jsonlint/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="dev-php/fedora-autoloader
+	dev-lang/php:*"
+
+src_prepare() {
+	default
+
+	phpab \
+		--output src/Seld/JsonLint/autoload.php \
+		--template fedora2 \
+		--basedir src \
+		src \
+		|| die
+}
+
+src_install() {
+	insinto "/usr/share/php/Seld/JsonLint"
+	doins -r src/Seld/JsonLint/.
+
+	einstalldocs
+}
diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest
index 2f375df20683..ce82527475c2 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -1,12 +1,7 @@
 DIST pecl_http-3.2.1.tgz 221244 BLAKE2B b6581829fb8a800e24ccedd4d0f3efbaf558850bdc356d27a6e1d1097a8e2cfc61963a1daccd1d0f269a7cef5b243d45cdfaff5138321fe20df615dde44d19e3 SHA512 e67d4b32ba6f524e3fcf65f5497b94275e1a4a14fce97c57afe366369f368b3acdbedf364ed73cf983fb2c5f57f498adaa1100e7c936f11cbc5de1caedad7b51
-DIST pecl_http-3.2.3.tgz 220204 BLAKE2B 2a712dc8f69a8a80f6f8c306883df580fdff4a0d4cb0ac06cc004f8622b30b8e2f5d373276381fd3ad67657a80cc929be81745f200a98b6ed5e475de5639dfc5 SHA512 e955e3246db9a9172081dd9a077154139c585bfce546e91839052bbab4d0db9d0695122574a66891ceba5c0b7e8a8f0768274e1516521ccb95cd19504dc13666
 DIST pecl_http-3.2.4.tgz 220631 BLAKE2B 996236cf9dd2f7d9bfaf046306e99c3ccf778261df19df8fd828b5811798f784841d89a6890e7347bd20cc6da71c966ea3ac9b17bf058e0bb766db7e1a8a6c49 SHA512 59c41d57c94a6e50e2f0b261130a24791b2845246f783b55e7f644f9a897d3650da364c5b38a860761b4a23f9266ed05000d6348bae2a7941e59d6bf5fb61a9e
 DIST pecl_http-4.0.0.tgz 218259 BLAKE2B c9f5973686fd4db95a24dd4c50f217b93becc6a439066a395b0b7fec6e977154e5ae8f2261414458aed8e4a9d1281f44da2ecc67a05127610579f5be91196a88 SHA512 268b569c23f10ed72fe3c84fc5e5bf526c3e5ac345ca0556a24fbd01ce95da468d4e9aac6300d058001534ab826836793bf901e9560b744f1e20d7059be2ec79
-DIST pecl_http-4.0.0beta1.tgz 219277 BLAKE2B 184ea0a92fc514f24fd31aaec7824ba80293a52d168d11b3b3a9cea410df1bc9a6a819c45f301b357a3d19246e3c36b56f238c264579509eadf00fb42ae32d91 SHA512 d3e487d10e18e8af1a750d171e4432dd30562e1fb8d8ae7cbb33a379e3d385d27a6ce1896ed8f727802eae1045505254cb68840395098310e22f6dc640c5c616
 EBUILD pecl-http-3.2.1.ebuild 2300 BLAKE2B 60e5a929270af09032e8494a55d90ef56b7a82821c4fb20a3ed8b03e08aa8ef77cc2d101ddbc31b095ec8b051acf9ebf2d0506a195e6f1aed4124eb54c6564b7 SHA512 0e2d36bfea79ec4662aff2425dae4193eff07864c2ef8c25bd087b56cba02c4c0eaa2af9c8449e64322ce0e42d75fbcfa8381e737172bd59c3e8a7d4dd90e0e0
-EBUILD pecl-http-3.2.3-r1.ebuild 2225 BLAKE2B 45d41708ee444876c304c109abc79dea3ae6fe905f3e479185b14ab4a56214e27b9e86cba06d64316a6d5070a93c535f3c71d62e8bd8d8c52c27db0079f728b5 SHA512 a20e4f6321d9f31a4b4c4e80b91ab7686b38ac984efc2529033793bc0ada3c48792141b99a566a148454619c74c663bf03cbc443a44e7da1e83200f813966583
-EBUILD pecl-http-3.2.3.ebuild 2471 BLAKE2B 1ffdd3704cf738741f61dd0370995530b32404d49d3bfbfd517612c11e27dbe8456786dc018d5cc03bd59cb03437bc2629ff775e52eb58cf4f1b14ac9e77bbdd SHA512 aaeb45f27eb7815b8fd4708ad7741a96fbe6050c01fc5465db364679f3224321e647d56a7b5e66bb87bbc960b674b453467baa7db7324e9b41974af155cbd97f
-EBUILD pecl-http-3.2.4.ebuild 2034 BLAKE2B 801d05dd8f4faf201c5079deb6d367b6b7cb6340ea693e019f321dfc2a96e6a94545139e8fabc57e26b179d829fe08da58666436ab276ce1e59edd3421e10ef0 SHA512 e3d2bae0a7c135d19a600e944d97190777a46421c3fccdb48bc6c7f64f391a161ca4ce4b22faebd6f8fdd8bcb071878daaea8b023cfe3d9972a1a07a0502f154
-EBUILD pecl-http-4.0.0.ebuild 1769 BLAKE2B 712a4d8aee8498a6cb8a9074ee7fc1c676021a336dcae0bc9a8c9115be389fe44189793363283099e747c61232460c2078213ef819f5c21134a851122c605d6d SHA512 b3d1d2f3760aebe5dee98de6e0068b614dc136a7e0daec92da5c295c228c7a857bb3880f42e93676702a3717a70026b3ebec1490e30fa6c79788182c0beec81e
-EBUILD pecl-http-4.0.0_beta1.ebuild 1844 BLAKE2B bba6fbc8f959af90e10eac63c9b5ee3d0fcc51680941073e602f8a2d0beee9c67b81c6ab59f072cf325dfb1c16b1283ceccc8de191145bfb00ce5840313a61c0 SHA512 6ecf7da9af0a836d5bacaac6c3bfe653c4503f933a590ad68ffeedc10fabc5bee0af6c517818b523159cebd19d441fbdf3cfcb90aeac798641a244e0d6827b6b
+EBUILD pecl-http-3.2.4.ebuild 2021 BLAKE2B f5cb3e15af3e2d4e263df6fe5b6a17f2beb2708950ba9259a2e571f18ff6da387390b42931adcc9251c4973fca9c5b9833659bf21918310f4400d4619aac4dc1 SHA512 86e25ed3765edf637cf9fbcb3d670366d82bba7a3f83542217693f6df530379baeb80ebe5a2c5a5f731497fc557e24aec866dd5980af4a79aff56f6e5b4f2676
+EBUILD pecl-http-4.0.0.ebuild 1747 BLAKE2B e73bd951bab8c3b1fc2da5e28557f77bf5b9dbad70440960ed43068ad4c1af26fa7d4745d05f4c5490bbf7cfcb8d47740e7e39d70323adcae83a89ca08500aa3 SHA512 c5e8b1b34da25acc2698dd6d1eab1d84dacb67730e28cf594f9084575cd2264a33e2b250d37fcb690bbfdecb52eb2c032e629e180bffa5781d5e7ce3d785e34e
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-http/pecl-http-3.2.3-r1.ebuild b/dev-php/pecl-http/pecl-http-3.2.3-r1.ebuild
deleted file mode 100644
index 209edf1ed14b..000000000000
--- a/dev-php/pecl-http/pecl-http-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="http"
-PHP_EXT_PECL_PKG="pecl_http"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_INI_NAME="50-http"
-
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-2 php7-3 php7-4"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Extended HTTP Support for PHP"
-LICENSE="BSD-2 MIT"
-SLOT="7"
-IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
-
-COMMON_DEPEND="app-arch/brotli:=
-	dev-libs/libevent
-	dev-php/pecl-propro:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?]
-	>=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?]
-	net-dns/libidn2
-	sys-libs/zlib
-	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] )
-	!ssl? ( net-misc/curl[-ssl] )
-"
-DEPEND="
-	php_targets_php7-2? ( ${COMMON_DEPEND} dev-lang/php:7.2[hash,session,iconv] )
-	php_targets_php7-3? ( ${COMMON_DEPEND} dev-lang/php:7.3[hash,session,iconv] )
-	php_targets_php7-4? ( ${COMMON_DEPEND} dev-lang/php:7.4[session,iconv] )"
-RDEPEND="${DEPEND}
-	php_targets_php8-0? ( dev-php/pecl-http:8[php_targets_php8-0(-)] )"
-
-PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
-
-src_prepare() {
-	if use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
-
-src_test() {
-	# Cannot use eclass function due to required modules
-	# All tests SKIP otherwise
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		# Link in required modules for testing
-		ln -s "${EXT_DIR}/propro.so" "modules/propro.so" || die
-		ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die
-		sed -i \
-			's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=propro.so -d extension=raphf.so/' \
-			Makefile || die
-		SKIP_ONLINE_TESTS=yes NO_INTERACTION="yes" emake test
-		# Clean up testing links
-		rm modules/propro.so modules/raphf.so || die
-	done
-}
diff --git a/dev-php/pecl-http/pecl-http-3.2.3.ebuild b/dev-php/pecl-http/pecl-http-3.2.3.ebuild
deleted file mode 100644
index df14e937eb77..000000000000
--- a/dev-php/pecl-http/pecl-http-3.2.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="http"
-PHP_EXT_PECL_PKG="pecl_http"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_INI_NAME="50-http"
-
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Extended HTTP Support for PHP"
-LICENSE="BSD-2 MIT"
-SLOT="7"
-IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
-
-DEPEND="app-arch/brotli:=
-	dev-libs/libevent
-	dev-php/pecl-propro:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?]
-	>=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?]
-	net-dns/libidn2
-	sys-libs/zlib
-	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] )
-	!ssl? ( net-misc/curl[-ssl] )
-	php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] )
-	php_targets_php7-2? ( dev-lang/php:7.2[hash,session,iconv] )
-	php_targets_php7-3? ( dev-lang/php:7.3[hash,session,iconv] )
-	php_targets_php7-4? ( dev-lang/php:7.4[session,iconv] )"
-RDEPEND="${DEPEND}
-	php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] )"
-
-PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
-
-src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
-
-src_test() {
-	# Cannot use eclass function due to required modules
-	# All tests SKIP otherwise
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		# Link in required modules for testing
-		ln -s "${EXT_DIR}/propro.so" "modules/propro.so" || die
-		ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die
-		sed -i \
-			's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=propro.so -d extension=raphf.so/' \
-			Makefile || die
-		SKIP_ONLINE_TESTS=yes NO_INTERACTION="yes" emake test
-		# Clean up testing links
-		rm modules/propro.so modules/raphf.so || die
-	done
-}
-
-pkg_postinst() {
-	ewarn "This API has drastically changed and is not compatible with the 1.x syntax."
-	ewarn "Please review the documentation and update your code."
-}
diff --git a/dev-php/pecl-http/pecl-http-3.2.4.ebuild b/dev-php/pecl-http/pecl-http-3.2.4.ebuild
index f4816f1ac8c3..0a717e5377db 100644
--- a/dev-php/pecl-http/pecl-http-3.2.4.ebuild
+++ b/dev-php/pecl-http/pecl-http-3.2.4.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 DESCRIPTION="Extended HTTP Support for PHP"
 LICENSE="BSD-2 MIT"
 SLOT="7"
-IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
+IUSE="ssl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl"
 
 COMMON_DEPEND="app-arch/brotli:=
 	dev-libs/libevent
@@ -28,12 +28,12 @@ COMMON_DEPEND="app-arch/brotli:=
 	>=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?]
 	net-dns/libidn2
 	sys-libs/zlib
-	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] )
+	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] )
 	!ssl? ( net-misc/curl[-ssl] )
 "
 DEPEND="
-	php_targets_php7-3? ( ${COMMON_DEPEND} dev-lang/php:7.3[hash,session,iconv] )
-	php_targets_php7-4? ( ${COMMON_DEPEND} dev-lang/php:7.4[session,iconv] )"
+	php_targets_php7-3? ( ${COMMON_DEPEND} dev-lang/php:7.3[hash(+),session(-),iconv(-)] )
+	php_targets_php7-4? ( ${COMMON_DEPEND} dev-lang/php:7.4[session(-),iconv(-)] )"
 RDEPEND="${DEPEND}
 	php_targets_php8-0? ( dev-php/pecl-http:8[php_targets_php8-0(-)] )"
 
diff --git a/dev-php/pecl-http/pecl-http-4.0.0.ebuild b/dev-php/pecl-http/pecl-http-4.0.0.ebuild
index a65db6f26344..92ccc331b626 100644
--- a/dev-php/pecl-http/pecl-http-4.0.0.ebuild
+++ b/dev-php/pecl-http/pecl-http-4.0.0.ebuild
@@ -20,18 +20,18 @@ KEYWORDS="~amd64 ~x86"
 DESCRIPTION="Extended HTTP Support for PHP"
 LICENSE="BSD-2 MIT"
 SLOT="8"
-IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
+IUSE="ssl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl"
 
 COMMON_DEPEND="app-arch/brotli:=
 	dev-libs/libevent
 	>=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?]
 	net-dns/libidn2
 	sys-libs/zlib
-	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] )
+	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] )
 	!ssl? ( net-misc/curl[-ssl] )
 "
 DEPEND="
-	php_targets_php8-0? ( ${COMMON_DEPEND} dev-lang/php:8.0[session,iconv] )"
+	php_targets_php8-0? ( ${COMMON_DEPEND} dev-lang/php:8.0[session(-),iconv(-)] )"
 RDEPEND="${DEPEND}
 	php_targets_php7-3? ( dev-php/pecl-http:7[php_targets_php7-3(-)] )
 	php_targets_php7-4? ( dev-php/pecl-http:7[php_targets_php7-4(-)] )"
diff --git a/dev-php/pecl-http/pecl-http-4.0.0_beta1.ebuild b/dev-php/pecl-http/pecl-http-4.0.0_beta1.ebuild
deleted file mode 100644
index af5bbf3e0b54..000000000000
--- a/dev-php/pecl-http/pecl-http-4.0.0_beta1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="http"
-PHP_EXT_PECL_PKG="pecl_http"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_INI_NAME="50-http"
-
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php8-0"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Extended HTTP Support for PHP"
-LICENSE="BSD-2 MIT"
-SLOT="8"
-IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
-
-COMMON_DEPEND="app-arch/brotli:=
-	dev-libs/libevent
-	>=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?]
-	net-dns/libidn2
-	sys-libs/zlib
-	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] )
-	!ssl? ( net-misc/curl[-ssl] )
-"
-DEPEND="
-	php_targets_php8-0? ( ${COMMON_DEPEND} dev-lang/php:8.0[session,iconv] )"
-RDEPEND="${DEPEND}
-	php_targets_php7-2? ( dev-php/pecl-http:7[php_targets_php7-2(-)] )
-	php_targets_php7-3? ( dev-php/pecl-http:7[php_targets_php7-3(-)] )
-	php_targets_php7-4? ( dev-php/pecl-http:7[php_targets_php7-4(-)] )"
-
-PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
-
-src_prepare() {
-	if use php_targets_php8-0 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_install() {
-	if use php_targets_php8-0 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
-
-src_test() {
-	# Cannot use eclass function due to required modules
-	# All tests SKIP otherwise
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		# Link in required modules for testing
-		ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die
-		sed -i \
-			's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=raphf/' \
-			Makefile || die
-		SKIP_ONLINE_TESTS=yes NO_INTERACTION="yes" emake test
-		# Clean up testing links
-		rm modules/raphf.so || die
-	done
-}
diff --git a/dev-php/pecl-timezonedb/Manifest b/dev-php/pecl-timezonedb/Manifest
index 1f7914e8b664..dc9279bf8523 100644
--- a/dev-php/pecl-timezonedb/Manifest
+++ b/dev-php/pecl-timezonedb/Manifest
@@ -1,3 +1,5 @@
 DIST timezonedb-2020.4.tgz 414667 BLAKE2B 1a219a090ae33a9f3eef76ab52e2bafd453a1f1161bbeeb53ee995d090f3fdd03c7a658a93ade72e3e1ae61df9d646eaef85dd4cacb5cea45c00adcfac8d6651 SHA512 d5c41c76b4b0b033464a4f086072d061504fc439c910c47a7077a0586b308cc37a4202ff9f418a39cee63534d55136d15a173bb94923160c0fa16bb33ac89a09
+DIST timezonedb-2021.1.tgz 415891 BLAKE2B c473f7d7556cae03263700300c09be75d3a827c4f80eaecd2683f706369d9e1a1a74379eba3fed720a51bba66da13ad330ea50720fe11f98fc5e495b6d406316 SHA512 53c53e061c1173e587b353da630272f2cbf9d223de7a49e6ce654b2c844da7afb641ef4a39ac4b17e0a56e86f23a4f4c448189e8c178e226ec0317f64c60c55a
 EBUILD pecl-timezonedb-2020.4.ebuild 450 BLAKE2B ce811112800741e818bfeb9d7275462e50e48dab938a11166e9a3a3f2afc3e10ab541d1308bb10590dfb5da819200076df33165c148432c8a82297f73cf7e467 SHA512 afb8a8dd9808a66dc0c97e86cfcb9814855e50845780533d394e9882a6b4bff578abaac660d1b58ac938d48b2d05872c0b593ba340dff04f97c97ab89f2685c2
+EBUILD pecl-timezonedb-2021.1.ebuild 450 BLAKE2B cc6e9f2f9528466780bdd5d356b9b3142107bf02f0f6af36fb2e3fbab7d2f43bc9e5d323cceb9aef5bbabae7e4fb35649f2db2ebc1292b907c19132e4c326f3c SHA512 f3f9d6da01f8b8cc385fab3ea89d4997a4eef7fb1a9a57dd3db841c341a77f844f1938e58b94c1db76b47659472c12d2f54f37adc0ee87756267cc1a201261a1
 MISC metadata.xml 635 BLAKE2B 9c3fa685e184fdb85fd630b9bbbd69bfc20569455f1fa84f147b2d2404739077f5bffbe2c4e5d1a1ff28a9f2ec36bb04d7d55952c7cee4cc5ee3dbc1b11bbc40 SHA512 3b06142a7f995b5859650fa156973deb5cf783be8ee123dc2820f1c4a0d8588d6c73a739a3fe547a3b450ee544a0a69abd260c44d53c87ba0c9911cd68e539dc
diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2021.1.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2021.1.ebuild
new file mode 100644
index 000000000000..6e41e4f16b8a
--- /dev/null
+++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2021.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="timezonedb"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Timezone Database to be used with PHP's date and time functions"
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+PHP_EXT_ECONF_ARGS=""
diff --git a/dev-php/phar-io-manifest/Manifest b/dev-php/phar-io-manifest/Manifest
index 146f897cb6f2..f1ae982e3397 100644
--- a/dev-php/phar-io-manifest/Manifest
+++ b/dev-php/phar-io-manifest/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 3913 BLAKE2B a3c8a3b75e2b150157892bc8ea168e7c60e5cef95cdee1279579a4b1efd4a4647bb5ec22f272575342d8945674fce048b1a091cd48977cdc77a975668c3a0849 SHA512 d43f3a726eb79ee88e674ac0ec3fb4d175ac0041b96638e4d2a40a47720ebd3a983cd36dd943fff9c0220dda68549361628636e94f595b0601d6eddf2b937fe6
 DIST phar-io-manifest-1.0.3.tar.gz 21903 BLAKE2B 48fb8858ea6c89415e78da399e2d3b6660e1857958094bf5e6c42465cfc32e34122ec1ab6e413f36f48e288ef40af7b85f93c80e6a2cfa547a166557de04ec97 SHA512 f8f9a6d4b761b739ec24a9f94ae5d4ac74f7276621675e3f3c7c3085aa7662c73cc703b1c86531d327199cf42074bb19446c14f78a3c8a888b1d236dc59bed94
+DIST phar-io-manifest-2.0.1.tar.gz 10146 BLAKE2B dad3a04bf63c53c2cf4c715eb752ca57458f936a0872db481e81452b9efc8f10bb3903248cb834c8e25eb88987b68545903e1f68876e284597f54ceef755dfe8 SHA512 5c9772a5a48f17abab3806bbb8f9c07a2f26f3231385fb7dd7dcdc390f925f0f7de2d07d8b0bb4e966de86c3262bb4900cf81c1bf897fb38425aa8d644c74e95
 EBUILD phar-io-manifest-1.0.3.ebuild 707 BLAKE2B 43809d8fc3bbd0e6e6937d7fee43c7d33f7ce71a08b215c7008c05a9a02addba0f598eec5136a227a433b8c45ed68ac7be58831586b1cbd52abf41ecd7edd414 SHA512 95db205b5928a1272f816f1fd8ccaf4baf1457b4b6e9e5c9138aaed5533e05cf4b8272dd641ac7e35dd13a35ea223ac8ccb4a47a8fa9cbdb0950c5b0f936f1e9
+EBUILD phar-io-manifest-2.0.1.ebuild 1079 BLAKE2B 47e9c7aa48dee6219ec90f6b106e9518d553c5cfdd4a3a6d5151738ba82c7af6b01ebd659ab2543e94f474902deaa3ea281ecf69c1b0bfd17a1b1f42582cbdb3 SHA512 6938c953c8e02aad408e0faa33aee945339ecc7ffc2b80c245f04a9f867ed96a0c2839fe21be5bdf6aa40287446b08a5e8150a8eb2bc9ad4561e7042123058c8
 MISC metadata.xml 344 BLAKE2B 627dae6eda92fb35dabea0e5b5bc023a92bd350c7828cb0bb39397d7254e1ed4d6f24c16b127eea35df4258c65985368bd3dbc0c353af8680ff216d8840e88f9 SHA512 0cd7c60c7182625c7779665c027bb0467531c3e00308413a4e02312b3cc0ae3fc2819dc27b24b92c9f723b0bde6168f11a6624a76da724d212cb0b99b69ed679
diff --git a/dev-php/phar-io-manifest/phar-io-manifest-2.0.1.ebuild b/dev-php/phar-io-manifest/phar-io-manifest-2.0.1.ebuild
new file mode 100644
index 000000000000..25f65d07e8d4
--- /dev/null
+++ b/dev-php/phar-io-manifest/phar-io-manifest-2.0.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Reading phar.io manifest information from a PHP Archive (PHAR)"
+HOMEPAGE="https://github.com/phar-io/manifest"
+SRC_URI="https://github.com/phar-io/manifest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="examples"
+
+CDEPEND="dev-php/fedora-autoloader
+	>=dev-php/phar-io-version-3.0.1
+	>=dev-lang/php-7.2:*[phar,xml(-),xmlwriter(-)]"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/manifest-${PV}"
+
+src_prepare() {
+	default
+
+	phpab \
+		--output src/autoload.php \
+		--template fedora2 \
+		--basedir src \
+		src \
+		|| die
+
+	cat >> src/autoload.php <<EOF || die "failed to extend autoload.php"
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required([
+	'/usr/share/php/PharIo/Version/autoload.php'
+]);
+EOF
+}
+
+src_install() {
+	insinto /usr/share/php/PharIo/Manifest
+	doins -r src/*
+	dodoc README.md
+	use examples && dodoc -r examples
+}
diff --git a/dev-php/phar-io-version/Manifest b/dev-php/phar-io-version/Manifest
index 2a0f93f17192..fafa251814d1 100644
--- a/dev-php/phar-io-version/Manifest
+++ b/dev-php/phar-io-version/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 168 BLAKE2B 8a0af6dc727f5f2fb7d43beda5e7d83bf5879117b4017ca3467d7f5da2e76dd50e58260ee0c3dd043a2da04693cca0fde4f1124aab317ef52cbc3855bd305683 SHA512 d02b31090ab4b2efe92ed0243c4a877a4a0731fc65fc7dd688087b08b3ced80c33570d9f081829354b35612e80b22f28df14cb35faad7466f925aa1c523f7404
 DIST phar-io-version-2.0.1.tar.gz 10348 BLAKE2B 22a4f8426c14662781534e63ddb62e4e783fe563ae061c0c3ae87960e0c649d68adff9b19e4388e9aafc52184aa273e8ecc5df08f16e0918258a2a4862950181 SHA512 068d872ecafc3491c7cd27068fa2b35cf1d7e3abe21649677c935e897b6582d2efcdcbcef71a00f3b9b416320f6139c671411821ad41e3b7c906fac5288646ec
+DIST phar-io-version-3.0.4.tar.gz 6574 BLAKE2B 95456e6980465cbc613fd3b835e11b4bc2cc8641234a88003418125bd27bc52eccaafef506a954cda521d269abb1b14129a8c8cc1dd082d01c85c0cc05c465c5 SHA512 4bc3dc68545d2ba98606bffb3fa289af7668a0df8c9ab67cd2e3a1fe7790e9ce00d4e3642022d8224ef5f3bd0ab0797b68ee73301530a1893b18c123fecf47d2
 EBUILD phar-io-version-2.0.1.ebuild 620 BLAKE2B 8a7c05200fae7e669a14342501ab4bb363818501305b3de329e86e3a36337a9c486041b253b3e3044cddc7f2c37c2700264a405750ea03ec18b8b0939ab291e9 SHA512 aab971d688553fbb2893c69396ccdca1a86aa13e08836bd376f2b6fe1239df4ea81c528a13d386726e82f7d688d5f73bb0a14a5c56ab0ebb387d403ec2fee8b2
+EBUILD phar-io-version-3.0.4.ebuild 782 BLAKE2B 60a058929a817fa62fddf3fd74a0a2c436d806b744f7aa50964cfb1de1f15a4f0cc9e357f3be6f5593fbdf6737a17be81fdf77a3e61058f4d935444800f2dd85 SHA512 5f62b547bc654a93b38f7c2484b799576cfc7324576e0a1185a95f4480d6ace3ce9c4a73fc50cfaba9e1aad5d22476047df3af53c75e4d39df91284f2951a606
 MISC metadata.xml 343 BLAKE2B d20b3e63391086da258cc1bd0b9daa3f582442ac5b7b99df1aea9ba6f46d65277ebb67c7d917ac43fe2d229765623a5aa89f2149ac53a94ab891286155b9fcc9 SHA512 d10bccd90c97e0902c76a6676d4a29a8bff2525ed3b9407d9abded13399416ce1830b6a9f18f45057b2636de97a945055092bcd593b9d2ac72668b4887f04bbb
diff --git a/dev-php/phar-io-version/phar-io-version-3.0.4.ebuild b/dev-php/phar-io-version/phar-io-version-3.0.4.ebuild
new file mode 100644
index 000000000000..1c28ee251730
--- /dev/null
+++ b/dev-php/phar-io-version/phar-io-version-3.0.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Library for handling version information and constraints"
+HOMEPAGE="https://github.com/phar-io/version"
+SRC_URI="https://github.com/phar-io/version/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/version-${PV}"
+
+CDEPEND="dev-php/fedora-autoloader
+	>=dev-lang/php-7.2:*"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+	default
+
+	phpab \
+		--output src/autoload.php \
+		--template fedora2 \
+		--basedir src \
+		src \
+		|| die
+}
+
+src_install() {
+	insinto /usr/share/php/PharIo/Version
+	doins src/*.php
+	dodoc README.md
+}
diff --git a/dev-php/phpunit/Manifest b/dev-php/phpunit/Manifest
index e2974e9db035..4bde773a07ff 100644
--- a/dev-php/phpunit/Manifest
+++ b/dev-php/phpunit/Manifest
@@ -1,6 +1,8 @@
 AUX autoload.php 11422 BLAKE2B 90c68a16ab1c2a81c31430984b426e0717881e29231ea008c6e75113d4180733af64a5edf7b1aabd8fd6e84b312ed79b80ee001d805d40f060b9b641c0c27948 SHA512 1d4fd0854a85bc404f5567b78effbc0eb41859601b8e56faaa4362e85ec4d07969864b21df3188fc5e82d5993c67655fa278a9c310b2ec7366aa2195c91e90da
 DIST phpunit-5.7.15.tar.gz 205474 BLAKE2B 0220edd59fc3f191b7621f275d3e4ee8f8bf514f74533d99bfb925e11cc54a235fb292ffd1bb54f6bec1e038c06e35a0dc43c1227618590f99e7e85638a7de28 SHA512 6a836e1ad1656fd1d1c5a58ced3c1826b4decc01798b6a804b487c9b4e094ec32f6eb8a84058e268eade62a2fe19d7bd1e760b8b9433299d9fe9c09afdf2bdd3
 DIST phpunit-8.5.11.tar.gz 159302 BLAKE2B fdf156842b3607f4cbd26194efd7eb7cb204fb1d1d078c0c6bd3bb68e520e5d748767f8aab64b7c9bf313161e3d84e08d415fbf0408c26541ec1f70cfe7af8bd SHA512 3e9db4a1d6c5bea3546b24bd837479a0114a9200f96034aabc96933dfb42c1237b03f7118f19eeb1216e32f2034c1ec8c632d20ecacbe70d3660fbbfd167ac79
+DIST phpunit-8.5.14.tar.gz 163158 BLAKE2B 8be0765b89cd7c7f91c7c8753eda9be46a38368c1b538b9e1a06b6f7e5b2cf2c37ef806338b7f4dd213962bfb8f7d749e1a97dd65d0e877fb2ffdeb747dcd344 SHA512 589cd74bf44c16ee0bb0b0e85f3468b0fdbd7e6ce968894954918094d49a0fed46570cac2fa2367f417715bf64f942f5742a292b09edd91317bbea06624ac313
 EBUILD phpunit-5.7.15-r3.ebuild 1535 BLAKE2B 27d95e1f95f3d7e19e03a1da5f6ed6f4e1ddf3227898959fef66f47564e371cf6975ef327bdabe6a33a2594223c2ad83699f0ac2f00769b8d8aad7469f5f7fc0 SHA512 7386395373e5a2434b02710601a93cb34c6f714a1a6a1037ffadb51c44c61f88586a916fbafc23cddb101b422d23c6bcb8268371804bdcd274bb5be37520fd45
 EBUILD phpunit-8.5.11.ebuild 3124 BLAKE2B dae0205a8a36f5895cf73b607b0dc206885b70126b4c78a4db83da64013f21fc0dc162ca120505129ada7cd2527bd7bc0eccd34188fe35f3937ecc2badececf2 SHA512 e8806ef9c92bcb3b9c2bfb2551864d6d2aeb92ca0b00389feb94375247fbd32d2154ba17c6d2f960421c1042dc236ae22b056f26991083c8902e1a97402c9d8f
+EBUILD phpunit-8.5.14.ebuild 3188 BLAKE2B a14aac210c05b2b726f763d58737e21a58a804c3bc7c3f6083446e8f78693a9bbdfb07644c32c6569d291e386d4d0f8461f36ddd7b4afb1d3a207f3765068863 SHA512 b126f5d94f53775f03f04186f04d30310323235bdb4b5e7636014e2b6bb46a43f37bdb8470bf7cc8995fc2121eaa34ad39fe0dfb994456b6d7fcb2579faea02e
 MISC metadata.xml 353 BLAKE2B a652d809f292e3ff3c73fa46bc060ec1bd1a2d21e72b0c5e195ce4ec343d6667a930b1f4e5a2aeafb79bf90ac3cf956dc70022e970e31d6d88731ce949380795 SHA512 551af54d66217054d5bf7bab7737dd4d58eb4abb89e73e1e0f05928ef79d02d404883fca1609e116e359ed63788c21992b6f2205b6bc4544b5f2a16dd0dfa136
diff --git a/dev-php/phpunit/phpunit-8.5.14.ebuild b/dev-php/phpunit/phpunit-8.5.14.ebuild
new file mode 100644
index 000000000000..b60c35cb8271
--- /dev/null
+++ b/dev-php/phpunit/phpunit-8.5.14.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A PHP Unit Testing framework"
+HOMEPAGE="https://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="dev-php/fedora-autoloader
+	>=dev-php/File_Iterator-2.0.2
+	>=dev-php/Text_Template-1.2.1
+	>=dev-php/PHP_CodeCoverage-7.0.12
+	>=dev-php/PHP_Timer-2.1.2
+	>=dev-php/doctrine-instantiator-1.3.1
+	>=dev-php/myclabs-deepcopy-1.10.0
+	>=dev-php/phar-io-manifest-2.0.1
+	>=dev-php/phar-io-version-3.0.2
+	>=dev-php/phpspec-prophecy-1.10.3
+	>=dev-php/sebastian-comparator-3.0.2
+	>=dev-php/sebastian-diff-3.0.2
+	>=dev-php/sebastian-environment-4.2.3
+	>=dev-php/sebastian-exporter-3.1.2
+	>=dev-php/sebastian-global-state-3.0.0
+	>=dev-php/sebastian-object-enumerator-3.0.3
+	>=dev-php/sebastian-resource-operations-2.0.1
+	>=dev-php/sebastian-type-1.1.3
+	>=dev-php/sebastian-version-2.0.1
+	|| (
+		dev-lang/php:8.0[cli(-),unicode(-),xml(-),xmlwriter(-)]
+		dev-lang/php:7.4[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
+		dev-lang/php:7.3[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
+		dev-lang/php:7.2[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
+	)
+	!dev-php/phpunit-mock-objects
+"
+
+src_prepare() {
+	default
+
+	mkdir src/vendor || die
+
+	phpab \
+		--output   src/vendor/autoload.php \
+		--template fedora2 \
+		--basedir  src/vendor \
+		src || die
+
+	cat >> src/vendor/autoload.php <<EOF || die "failed to extend autoload.php"
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required([
+	__DIR__ . '/../../File/Iterator/autoload.php',
+	__DIR__ . '/../../Text/Template/autoload.php',
+	__DIR__ . '/../../PHP/CodeCoverage/autoload.php',
+	__DIR__ . '/../../PHP/Timer/autoload.php',
+	__DIR__ . '/../../phpspec/Prophecy/autoload.php',
+	__DIR__ . '/../../SebastianBergmann/Diff/autoload.php', // Before comparator which may load v2
+	__DIR__ . '/../../SebastianBergmann/Comparator/autoload.php',
+	__DIR__ . '/../../SebastianBergmann/Environment/autoload.php',
+	__DIR__ . '/../../SebastianBergmann/Exporter/autoload.php',
+	__DIR__ . '/../../SebastianBergmann/GlobalState/autoload.php',
+	__DIR__ . '/../../SebastianBergmann/ObjectEnumerator/autoload.php',
+	__DIR__ . '/../../SebastianBergmann/ResourceOperations/autoload.php',
+	__DIR__ . '/../../SebastianBergmann/Type/autoload.php',
+	__DIR__ . '/../../SebastianBergmann/Version/autoload.php',
+	__DIR__ . '/../../Doctrine/Instantiator/autoload.php',
+	__DIR__ . '/../../myclabs/DeepCopy/autoload.php',
+	__DIR__ . '/../../PharIo/Manifest/autoload.php',
+	__DIR__ . '/../../PharIo/Version/autoload.php',
+]);
+EOF
+}
+
+src_install() {
+	insinto /usr/share/php/PHPUnit
+	doins -r src/*
+
+	# referenced by PHPUnit/Util/Configuration.php
+	insinto /usr/share/php/
+	doins phpunit.xsd
+
+	exeinto /usr/share/php/PHPUnit
+	doexe phpunit
+	dosym ../share/php/PHPUnit/phpunit /usr/bin/phpunit
+}
+
+pkg_postinst() {
+	elog "${PN} can optionally use json, pdo-sqlite and pdo-mysql features."
+	elog "If you want those, emerge dev-lang/php with USE=\"json pdo sqlite mysql\"."
+}
diff --git a/dev-php/reactphp-promise/Manifest b/dev-php/reactphp-promise/Manifest
new file mode 100644
index 000000000000..4efcc912cd4e
--- /dev/null
+++ b/dev-php/reactphp-promise/Manifest
@@ -0,0 +1,3 @@
+DIST reactphp-promise-2.8.0.tar.gz 17178 BLAKE2B 43e5a9eef0f774ec4de7be44fbab300dfd78a23b21de2acbb39e44af49ee95b2532f66b711acc4ee152522d4725e1e29f9abae20d0ac2e18fba3dbb3f615cc5e SHA512 8c882c96b47cc53f791de964303014feb00a73594a510287ea352ff619a8432d88f4c094523d4de98234f985f7351cd244bb094484a257aa36357e85eb0ee62e
+EBUILD reactphp-promise-2.8.0.ebuild 909 BLAKE2B e6beedd68edab2c3ae503427f7583d3b252f5d80fdd8493321863a1f967d06ac6af3d4869195b5f3aa81c21360f48c3226920dbf3ba53b71b87e5b6d3386ca7a SHA512 71328bf38f39ba27ff2573195321cf4956771a5843b1f35f8b164c93a801b4b6cbf0d4648957077da3a3c697ce935542bbaa21730bb3008e27382fc0bef11d84
+MISC metadata.xml 344 BLAKE2B 88de1a794f1b94149fdd01834e7992368c05e039ed6c29131d4dcb01cd77a16d6abe848b89c34829d60b075e20acee99485048c491e371c8209dab12251fda16 SHA512 af2be4270745346e5749954b1ea03bdf37cfec87e8f091aea83867fec0235bc138141353cd81adecb3e37b6bc95209bd234c90217dce017fa0d2f53d474f14c0
diff --git a/dev-php/reactphp-promise/metadata.xml b/dev-php/reactphp-promise/metadata.xml
new file mode 100644
index 000000000000..3ea1553292f1
--- /dev/null
+++ b/dev-php/reactphp-promise/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">reactphp/promise</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-php/reactphp-promise/reactphp-promise-2.8.0.ebuild b/dev-php/reactphp-promise/reactphp-promise-2.8.0.ebuild
new file mode 100644
index 000000000000..df2600171222
--- /dev/null
+++ b/dev-php/reactphp-promise/reactphp-promise-2.8.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="promise"
+
+DESCRIPTION="A lightweight implementation of CommonJS Promises/A for PHP"
+HOMEPAGE="https://reactphp.org/promise/"
+SRC_URI="https://github.com/reactphp/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="dev-php/fedora-autoloader
+	>=dev-lang/php-7.2:*"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	phpab \
+		--output src/autoload.php \
+		--template fedora2 \
+		--basedir src \
+		src \
+		|| die
+
+cat >> src/autoload.php <<EOF || die "failed to extend autoload.php"
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required([
+	'/usr/share/php/React/Promise/functions.php'
+]);
+EOF
+}
+
+src_install() {
+	insinto /usr/share/php/React/Promise
+	doins -r src/*
+
+	einstalldocs
+}
diff --git a/dev-php/scrypt/Manifest b/dev-php/scrypt/Manifest
new file mode 100644
index 000000000000..414b4086348b
--- /dev/null
+++ b/dev-php/scrypt/Manifest
@@ -0,0 +1,5 @@
+AUX scrypt-1.4.2-php8-0.patch 1277 BLAKE2B 1bccdc8deb053f13e7075f0d52a14a0f0767fa1f2d2f487ef6387f5b6dcba84879350051f85689e3e2518a53a5952836adc566d4c42e2b8fb08ee81280929637 SHA512 75ed1c9da84fd121941df5bca59b26cb90158817fd4efec375cfe923868c439efdd9f6f06e2c153eda9bfd4e4cc095f22e32b37056c8ea3ed0eeeb1f13e77e0b
+DIST scrypt-1.4.2.tgz 21585 BLAKE2B 6297b15aac8470eedc619c498badc4e453476a390cab0cfe7fabef00012131ff9e363834b9423a566dba603ea2a4351eee416419cc1e6c1245a9aba54d63a5ab SHA512 34a87e63250dcfb21b3d36f90a4e5f4bac9f0623917ceb0d613d49112ce0e13df9a93fb0730fb797be6337d023dc490fb881902b5492309fe8bf3e6fd5e685a0
+EBUILD scrypt-1.4.2.ebuild 395 BLAKE2B dbb271382adf2201d669bcf774ad18e766434b9adc391f76eb81a7e6c31e485a192b298d15daa01be4e3cc467d003b8eecc522e8c808a52315c10498bd55eb39 SHA512 991c793096493e35138ec3998e13ed78ca9c6899223e0b3cc0340980de965fa1fcb3c30a08f5997381f00632b1a7606aef35aa2697e78e94b15cdea79c3e8df7
+EBUILD scrypt-9999.ebuild 414 BLAKE2B 5262f81f837afb03250dd545892d45586df821b04661edb35ea1d826c51b7b2638fc707779fa34307cd3e5924f4182fd9bd959a8135e58845a52361db32a3a1f SHA512 7711fc2f3b8094c691823440f3dd87d3973b54a1e0139e6d2689ecabd5a24241388dc2f77ee52f46435914cfdc2de8768628897398383c09afa7957a22f829eb
+MISC metadata.xml 791 BLAKE2B 54438dacf2c3e77edf475a1f695b58c4606f7492d39a74688ba4a2f36afeacf94560e63748fc097e962d6fd79883489281463c31449591f8fe6a84602c126658 SHA512 b551b92c17a66648f281b07d638af5f6e4fc703ecece2b594bd7d1b0753687c1f0e67e0607f4eeea5f708f76e348a8cc352ead97e5264368fb3e070d8d748419
diff --git a/dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch b/dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch
new file mode 100644
index 000000000000..a5e1ea665897
--- /dev/null
+++ b/dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch
@@ -0,0 +1,49 @@
+From 5010f9fa0743518d149d994728ca930503adde1e Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Tue, 22 Sep 2020 14:55:32 +0200
+Subject: [PATCH] trivial fix for PHP 8
+
+---
+ crypto/crypto_scrypt-sse.c | 1 +
+ php_scrypt.h               | 5 +++++
+ php_scrypt_utils.c         | 1 +
+ 3 files changed, 7 insertions(+)
+
+diff --git a/crypto/crypto_scrypt-sse.c b/crypto/crypto_scrypt-sse.c
+index a52ce81..709a04f 100644
+--- a/crypto/crypto_scrypt-sse.c
++++ b/crypto/crypto_scrypt-sse.c
+@@ -44,6 +44,7 @@
+ #include "sysendian.h"
+ 
+ #include "crypto_scrypt.h"
++#include "php_scrypt.h"
+ 
+ static void blkcpy(void *, void *, size_t);
+ static void blkxor(void *, void *, size_t);
+diff --git a/php_scrypt.h b/php_scrypt.h
+index a1117c8..6cc1c4c 100644
+--- a/php_scrypt.h
++++ b/php_scrypt.h
+@@ -35,4 +35,9 @@ PHP_FUNCTION(scrypt_pickparams);
+ extern zend_module_entry scrypt_module_entry;
+ #define phpext_scrypt_ptr &scrypt_module_entry
+ 
++#ifndef TSRMLS_CC
++#define TSRMLS_CC
++#define TSRMLS_FETCH()
++#endif
++
+ #endif
+diff --git a/php_scrypt_utils.c b/php_scrypt_utils.c
+index 797e2c7..34fe347 100644
+--- a/php_scrypt_utils.c
++++ b/php_scrypt_utils.c
+@@ -25,6 +25,7 @@
+  */
+ 
+ #include "php_scrypt_utils.h"
++#include "php_scrypt.h"
+ 
+ /*
+  * Casts a long into a uint64_t.
diff --git a/dev-php/scrypt/metadata.xml b/dev-php/scrypt/metadata.xml
new file mode 100644
index 000000000000..7fd91a5b5f80
--- /dev/null
+++ b/dev-php/scrypt/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>spiderx@spiderx.dp.ua</email>
+		<name>Vladimir Pavljuchenkov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+	A PHP library providing a wrapper to Colin Percival's scrypt
+	implementation. Scrypt is a key derivation function designed
+	to be far more secure against hardware brute-force attacks
+	than alternative functions such as PBKDF2 or bcrypt.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">DomBlack/php-scrypt</remote-id>
+		<remote-id type="pecl">scrypt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-php/scrypt/scrypt-1.4.2.ebuild b/dev-php/scrypt/scrypt-1.4.2.ebuild
new file mode 100644
index 000000000000..026a54355943
--- /dev/null
+++ b/dev-php/scrypt/scrypt-1.4.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_ECONF_ARGS="--enable-scrypt"
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="A PHP wrapper fo the scrypt hashing algorithm"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-util/re2c"
+
+PATCHES=( "${FILESDIR}"/"${P}"-php8-0.patch )
diff --git a/dev-php/scrypt/scrypt-9999.ebuild b/dev-php/scrypt/scrypt-9999.ebuild
new file mode 100644
index 000000000000..900385d5cf23
--- /dev/null
+++ b/dev-php/scrypt/scrypt-9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_ECONF_ARGS="--enable-scrypt"
+USE_PHP="php7-3 php7-4 php8-0"
+EGIT_REPO_URI="https://github.com/DomBlack/php-scrypt.git"
+
+inherit git-r3 php-ext-pecl-r3
+
+DESCRIPTION="A PHP wrapper fo the scrypt hashing algorithm"
+SRC_URI=""
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="dev-util/re2c"
diff --git a/dev-php/semver/Manifest b/dev-php/semver/Manifest
index 71243ff7261c..29ae0c0912ac 100644
--- a/dev-php/semver/Manifest
+++ b/dev-php/semver/Manifest
@@ -3,8 +3,10 @@ DIST semver-1.4.2.tar.gz 10408 BLAKE2B 1504b6dff157e1b3c5ca338060e668f478fdd4e6a
 DIST semver-1.5.1.tar.gz 10534 BLAKE2B ca6743415867db96696cc604c00a1ffabb35617af055a621079621fb73d951453f4c893ccf1377a142c05f5481a42884b380455c37e4e945c382f811a3917f72 SHA512 c9b582217060124fe20dcd7821e669173b9deffa976ad8921f48d22793f03af5deb4006380932e49e06da13a63db9aaa63254118d43448575446b78226d9cf3f
 DIST semver-1.7.0.tar.gz 11249 BLAKE2B 8997f07f009f64472762fdccc8255d7149a03416bf912d74bb818d8bb3b31e81c5897d15e3a0dc0b6ad28fe2e0ddadc13f8c4f9ff63bfb05f6c5880a74d90a89 SHA512 7d90d172c91d56218b44d994d9b997486c950c72d19026c9a9cccd594348896222aa4b74ba9fd0735e2702b7a63133fb6a16089ace97bd2b8f97dbe862b07e82
 DIST semver-1.7.1.tar.gz 11433 BLAKE2B 9f0f054bd657081efd73a23c2ce3d04d12c2fbd8115c54d5b17ca895e7a6bf47a50fdd13213560dd7a0c75a427dbc2aba5c610a726dcc2729d7a531e0c6c1d7d SHA512 7e2f60dfbe7b39eb2a6fcb0439e4ad94d981f4b7b467f0853e923bc22dfe95d1ecaf6ae537ddc46f774cddd0d01b4cf73b6588dbcac45edc7811cacf26f3d23f
+DIST semver-3.2.4.tar.gz 19806 BLAKE2B 8d8c78f570c7b2c4b37a096e2835c2611d09e77cafaab555b588d48fa0600b85bc9487d54d67556eb2440e0d04b6ffa46c54dd678b4c2cc7b206fe6d33157111 SHA512 ed2aed0a55e23f76b05b1dc3eee18938eda1d21205f786d02c83a879dd0ef5aaf799201967c2166e70f383980ab047bd93dd7d1b5d7154d853d551bafa2eddb1
 EBUILD semver-1.4.2.ebuild 650 BLAKE2B 51835a3f2e3f7885b685b7d6e39a8974133d02952b774d5747c19ff5b2e02ccca0cfeb778ee5ff346829904bf26d09cd30f1d6c735c5e7fbf79c50cb78156907 SHA512 ffa8c080827f77ba52151a95612a979f882b99a61990fcad378b5a0783b50172f70f35b4def84ae1262e1292d2a0dba6ca407a88e3d49053247bfecae2e1fd68
 EBUILD semver-1.5.1.ebuild 650 BLAKE2B fa3328c96907a5076d8bdeba7f212aca9cd18502395c4bbaf127a3c3aa2883cd9302cac9b043b17be92f394da400a0416e79e9b43529ee80886207a9a44712fe SHA512 7ca5c9cd89cf86a0725e7aa068ed16782403a68cf0a14c67deb3a172073b33620cc18af29c6d5ca870e85c97a2670fd581baeaf292a9b5541a8223ca47619779
 EBUILD semver-1.7.0.ebuild 650 BLAKE2B 48f33a5b5cfc3897c26def0674632aeb716a7b47d1c618a683cf9546896fb09ff861bdda63c5604b9451057ac91f15582ebe41d570282a43d7a6c5f17f2030fa SHA512 41bffeb1143f9545379e3db6b37603a2190e2cc2e959900019ac38a60a795e2991c2b73cdc5f6d2b15a281c1629533defd9eab8fff1c023541e0ee4313fa3ddf
 EBUILD semver-1.7.1.ebuild 650 BLAKE2B 48f33a5b5cfc3897c26def0674632aeb716a7b47d1c618a683cf9546896fb09ff861bdda63c5604b9451057ac91f15582ebe41d570282a43d7a6c5f17f2030fa SHA512 41bffeb1143f9545379e3db6b37603a2190e2cc2e959900019ac38a60a795e2991c2b73cdc5f6d2b15a281c1629533defd9eab8fff1c023541e0ee4313fa3ddf
+EBUILD semver-3.2.4.ebuild 678 BLAKE2B 9af1b5890e3f142927f10e8705575f0f10801225dfe8e833cd0992ea1814dd77dcbc589af3416052452b2074e78a288a73f0ba9eebab7499d7570dcf3d73937a SHA512 55b2c8fcc02006f4f07e251dddc32a63fe4cbe06625553b2b3976339bde26f3cb1e4a47b54808cf93f0c3851669f8f0abed045d41acfe65bc11043b7d1310de0
 MISC metadata.xml 553 BLAKE2B 7237fb4cb467d7bf22fe07ccd7b6cfc9d046ca184aabbad0f70312a4874b37aa81fe315921d574b19e115ee9d12c978524fa27b739d4a348ea276e341769c275 SHA512 abce730eef9026ee6e6df2c217624d8d588db4aa0ea7027b5f933e24d1ce5f277f24f033b1bcbc1185b0cdebf9e1f289137e75735a7bbb41f899c1e31c88efae
diff --git a/dev-php/semver/semver-3.2.4.ebuild b/dev-php/semver/semver-3.2.4.ebuild
new file mode 100644
index 000000000000..ba48da91ec5f
--- /dev/null
+++ b/dev-php/semver/semver-3.2.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Semantic versioning utilities, constraint parsing, and checking"
+HOMEPAGE="https://github.com/composer/semver"
+SRC_URI="https://github.com/composer/semver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="dev-php/fedora-autoloader
+	>=dev-lang/php-7.2:*"
+
+src_prepare() {
+	default
+
+	phpab \
+		--output src/autoload.php \
+		--template fedora2 \
+		--basedir src \
+		src \
+		|| die
+}
+
+src_install() {
+	insinto '/usr/share/php/Composer/Semver'
+	doins -r src/*
+
+	einstalldocs
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 7b4630ac2f63..e795bd85758c 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 5a9d30b522f1..0fac874d12f1 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -4,14 +4,23 @@ AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152
 AUX django-gettext-0.21.patch 1511 BLAKE2B f015223f61dbea17e0de888fc8d8008e8acf7f1aeaa4d93a97d83902a3c0af5b7ebf45aefc3bdd1ebb1ab5633aeb20dcb42b3c96d12b3fe2666a245a0d6c4f1b SHA512 3892b175c35b1018db43848b7aa2b6a1b79463562f6740189e82a2eed82c8f9c024ec2a20faa195311dae01afa19ff3908f6a716c0412ce9b0a0646bdd794e26
 DIST Django-2.2.17.checksum.txt 2438 BLAKE2B 5d9454884110f1debec7fa1644b13be43b9b6b8d3f333a05df823332c94a6f4a220791bf0cc7d139baf5aac856443a4b211dd8e98d23d4cc62d1d6ce7ebd69c8 SHA512 0dc71edfe3264d3353238124dc5374aac07fb73ede167a52f16bf3b147bf351651f4197a1fe5027dca23ad144755fff6447f06d8cdf11126184cf5e291c90402
 DIST Django-2.2.17.tar.gz 8885492 BLAKE2B 30046adc54c31e0e8dac3c573da58e8536246ba6fc5675ec5ad5efc4b170331b893ffe766e7eb404b445d5b37e018e1ac9e2b8e659a5f10c4c165ec9ef5c00d1 SHA512 4ba1e12332cafaa49a087494f9e85e992a414ad153ef935fcf50f1a533ac9c7049a421140552f77b3dbf41c51a4f42aca13dc5f8f479049c21037c541a34320b
+DIST Django-2.2.18.checksum.txt 2556 BLAKE2B a2cbb2f10c8173bfbb29033d2e33035a04ce0a6c997a3930f4fc59951e46ea31df23a664df1a11b7d652d7efb794b55d7dadb4e0868245afbb2951f630b674c9 SHA512 f48fda050be7d88783bdbdeafc5bf8dd130eb43b7ff08bb1ac7602f5e94615cb2f02a05787dbb025df3f01d70f789d03220651b8217de5ba48cffadb0d57ba7d
+DIST Django-2.2.18.tar.gz 9180844 BLAKE2B 4001c89674dacaddea279e4e9484cc820a18115bda3a0f8091797fd0924ee7b9aad0e520b1bda21b539e8b140dc473154e4cd6f11a16fb706dd3ee8e7dd8679f SHA512 8c38330042244513576151a9ae64293b9838df42dcb4204713859dd8fcd81154edf42738d0bd05770c9bbe13bfdb1f73781453cf1d14fbc31149a2cb89e34b59
 DIST Django-3.0.11.checksum.txt 2438 BLAKE2B df936992a02e5a34b26e91654962507d973f8831c1eebada4cbdb578f83fba974532867b9f20828afc2467c2521e117b8dd543cde6f664d3c122a95207c50608 SHA512 a7b98d102775cc7854b0c242507d4ff8778984dc8b2e269352103249d6d1c5cea7e6eb8dbe08700b19ad4428e30c469e0e959a622ea4ce3198a75f72b2bb8871
 DIST Django-3.0.11.tar.gz 8958879 BLAKE2B 078ffde9ae186ae8add2136c303ba38a1b38525481b2272384b8a1bb3428dcf6a31991a86b2078aea6cf250808af399acac5461a33c8e1fda5d6bc552eac478f SHA512 d24e8167f3f871f24ea5e288557a49d71f9b5c398c84e8434d5d3dc224ef62775121a016ad89e997fabe88893adc3a83176211d5b9a9730ec23d37d256aa4fb0
+DIST Django-3.0.12.checksum.txt 2556 BLAKE2B 9012a130029c6fe73ace78fbdd32f1653bb7a7e84c343c394acc5563b7de9b5d6ec58734fdf79f2e7657f18644dd3a12c12c4a400a1002ad74d0891738ef4137 SHA512 46e7291f4d73472a118ff3aca4f597d6abde4a4217bb95ed84fda91efd0ed63e946d9ddf35ae65ff1e898462aebc32a3a43241f261099b17667958412d5afb32
+DIST Django-3.0.12.tar.gz 9255277 BLAKE2B 68be34ddad965bacca6bfcf045b5ab4072ef8a17f09acc674d2b5535b074d90c6881fd22edd89bdc82eefc90a2e7f561a041f9da066b85c13b10866f731a6106 SHA512 7f21a1a88a8c57d3b6ffa1a39e0df491e45f4e37181c4951db2a330266bf3ed8bf4e240a69a9b627dbbb090816c991b877b777e35b1c252a5ee08680eb3b0135
 DIST Django-3.1.4.checksum.txt 2466 BLAKE2B 635ddd40b542890aef29f53df0fad172e48450081f57c72042a71bb5de654b1d1f5f7ce0c588b1070a203e1d4afe3a1ed19431dd23a2a67cd510d4072c79a00f SHA512 729b771008489bbf0563002e438ef88abb2a14b2c29f307cb2db9c75450f30ac8bd4920bf0493dbec06b3640fc0d4b6817e8a054af1028ad065bd321c761a6c3
 DIST Django-3.1.4.tar.gz 9392125 BLAKE2B b583442de50c358e70a49b9ef557d43211e6faee17933a44012dbb9f0dac3ccbf0a91e01a2b8b798fff7ae05100199e9e9c94a81748b41ea13e49d12bb510617 SHA512 02cfaabb25e5f932dcbf659faba2f0afe298e4bee4f510f7adebfff181bdd13c3a0b08e8ce379bcc59326d904be8699db4ce31065d93566b93cad758365207f5
 DIST Django-3.1.5.checksum.txt 2428 BLAKE2B 69347177b3c8c592a0b9df832c8f0abebdd4f1ff420f95f63310eb41d3614b241dc8f01b71abfec12faa006a8e69310d31cd68425f57ecf7a02948e83c65e0b3 SHA512 93d3e0de057518b60d9da2c1193ec59a8601f53b5d81a09fa4f6866336fbff85b81c01711eb07544fce30fe17e6dec89e5a5d6a66a929d451bca77cfe172bf19
 DIST Django-3.1.5.tar.gz 9257571 BLAKE2B 0ec618753d922e64b2f0e75506843383568c0013a8f7528cf10e9ee49ffc7be8a3effda39c27497510728a16d276db5c620bab22b5a001a86cafdb4d4e2560ea SHA512 b8f0e034fcd282d6e4a9e42565da5d5f4750c900264bed10e72b8c1866370f75fd1bc856d22950e1d3ad03229c38559989a26ccc9f1252ea31d407410134a548
+DIST Django-3.1.6.checksum.txt 2547 BLAKE2B 509254e5d24cdddfb452d922554db12a16ee1c5840d61d17f57c7b209aa71e3b8c8279efec35508cafd059836601d85bca16a33c618b466c438fc323bcbab720 SHA512 d9dd2763285ae9da7cf24bff957ed2cc78ab088fa34ad45fe176bd869fb892a0e50d2b67fb6a0fcda08f85c68602a3b1f76c265e3776d762f2ee1f96f0dd116f
+DIST Django-3.1.6.tar.gz 9645871 BLAKE2B 96269d5977d422e62637a956ea8b1af7abc4647350aa4c913e986a7104843d2a4d6c6425deabe2358e819692a721caa18002448b780d4384493bf9078bfbabd1 SHA512 fe5baef4aee51cc84292d1f4d3681cff8170c1307aa172b86faa15771af2c3e0b4dbb24ae671ad8ed31c53ab38ed99c64b5deb69d77fc268d8a232f3463c3221
 EBUILD django-2.2.17.ebuild 2762 BLAKE2B e7b3df1a436c78c4f0307dd7ea5c70c25a399c7ea6bbbee31279cce0009366eceaaf39573855b32946d17f7540b74551d31d47fa1859f949710623779ab441ba SHA512 31a105e7248a0ee72f9008af78a00d35fb32d06572b1554d3e1641d0823d65164d3f82749d44b34230c833d8da26a71dae86b8286e8821cab8e971f66a6cc3c3
+EBUILD django-2.2.18.ebuild 2724 BLAKE2B 3d63689c835c6aeb256f9b87b99b9a4180c06e7bdf7cbf316cf4e62039a4f2dce018353268e6e1d3d9eb0a21be9f5336cda8d074504e49b829b2a9403996e416 SHA512 70e5977cb35296231da0ec30f074d41af1d0cef1562fffb2fc07842bf3742f31982e159be2f9652dd151d25680a3a80b9a4d3b15f93be9b86ec74ebf8fbb80f2
 EBUILD django-3.0.11.ebuild 2925 BLAKE2B 7c74e016b94f5c455d146760c6dd1963639824b8f4a0843c53737b432a4bc05086c3717f7c9fb1e3a5ffa5060a47dd816943b2e83b50fa0831cd18db9c0179f9 SHA512 0581674489b852d9d94d05fb9a0a870c5833508a78893f8635dcf1c2230e9f41cbaa4202c74a9995d06cf806ebbdcaa40bbce7947a520691bc35b5cf50549459
+EBUILD django-3.0.12.ebuild 2887 BLAKE2B fa1108fa19fc0a304884637f55a2717cf57d73f3868035c0bb9fca803f6e4b79b2628e8b7a8d685a2f5def45bd3a3a0fd86e74621046c0d21fdef455919538a8 SHA512 fce2cfc37940405df38de7dcb096baf32a81f8de4fe1d88cce1aae192cd7a6c31cdb5cca05d6fa85accf4e82bd9bb2ec854724b4b02206971fe1b8a8c5d8986b
 EBUILD django-3.1.4.ebuild 2737 BLAKE2B 735d587eec929a5cff79a4518703a434864220bb3d1e83398ec95b78a0b815e43e8087fb5b96f688f10f3ce41f97965804f3cc9aa7be4aeac35a129eb8af8462 SHA512 dd17b28a91ae6164c1307569b9099b116f22aa5f1b187ff02b0a9dad6bafa422c431aea0af25c4d078b8c39c4bea90eabee38e2d1d727be1cb4c887e091849e3
 EBUILD django-3.1.5.ebuild 2748 BLAKE2B 6c7e9ca78e992ddfe4c810360c5e02b20a9321832ee9179791fdadcb48606962b6a8d9398353cb4fe87b61637704cfae341ef0d8c4b84f373de1afbbc5733cff SHA512 2fa5fc770190f91bcbceca911d366e0dd70f07c8354887908bd80dd3fb2fecd59ef5c6082103e77caf47d621d55c6811d46fe3f6c08d2e832de7a454d1740e09
+EBUILD django-3.1.6.ebuild 2748 BLAKE2B 6c7e9ca78e992ddfe4c810360c5e02b20a9321832ee9179791fdadcb48606962b6a8d9398353cb4fe87b61637704cfae341ef0d8c4b84f373de1afbbc5733cff SHA512 2fa5fc770190f91bcbceca911d366e0dd70f07c8354887908bd80dd3fb2fecd59ef5c6082103e77caf47d621d55c6811d46fe3f6c08d2e832de7a454d1740e09
 MISC metadata.xml 399 BLAKE2B f49845f5a6476a0b43cbe47ab11b298f53703d850d145a31967f512d9402048fc1b1891606ddba7342ea9613c27ace3986f6b508ed83f0c5eccb26a13fd49f85 SHA512 92470f2930b1c940ccf3478b11157adcc4b84924b0cab4e1fd8aae98c7bba14e995491ce44810223eeb3802967be68c867d0ee4ac0df9f49b4234efd1a7ecfa7
diff --git a/dev-python/django/django-2.2.18.ebuild b/dev-python/django/django-2.2.18.ebuild
new file mode 100644
index 000000000000..8f0c89ec277b
--- /dev/null
+++ b/dev-python/django/django-2.2.18.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+	)
+	verify-sig? ( app-crypt/openpgp-keys-django )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	elog
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-3.0.12.ebuild b/dev-python/django/django-3.0.12.ebuild
new file mode 100644
index 000000000000..c5e25f2be57a
--- /dev/null
+++ b/dev-python/django/django-3.0.12.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/asgiref[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+	)
+	verify-sig? ( app-crypt/openpgp-keys-django )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.6-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	# do not bind to a specific version
+	# https://bugs.gentoo.org/750695
+	sed -i -e 's:asgiref ~= 3.2:asgiref:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	elog
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-3.1.6.ebuild b/dev-python/django/django-3.1.6.ebuild
new file mode 100644
index 000000000000..e6482b2c0bde
--- /dev/null
+++ b/dev-python/django/django-3.1.6.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/asgiref[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+	)
+	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	elog
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index d6676646bf81..a4fa652d35b3 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,5 +1,3 @@
-DIST guessit-3.1.1.tar.gz 147605 BLAKE2B 3b11747b652e922aada12ce771c1e91e8842c78c221ac39c068488ae6cae95ebc6d9f6d8849aaef11d522e2c7d6e6f8e34981179e48d9db649e811c5fa2e52ef SHA512 6a02c4024d286cf49c62e072bcb616a052cec1ce51d364b17cea1768504c4ecebba914a3bf5beda9a61dca0e7764c8642cb5b918a20fb25cdd7120ad1667825f
 DIST guessit-3.2.0.tar.gz 147286 BLAKE2B 0ab249eb82204fd58a6d6c960b11b2009a3055ae91a91c244192a2bd9832e7356f444a6b4291cf56d55a4c9a1cd0ccec22d527114d61f9f5888a8439918ba6bc SHA512 5eaa0ad8cdf60812bebf10af51f62095baa70f48b66a052002fceb0d705daab3b8bcd2cb0fc3d18b63b9f4aa8118b9d85283bebdcfdb8ed4204e1b7e2b5ae78c
-EBUILD guessit-3.1.1.ebuild 1068 BLAKE2B 877a623f18a63dd7cbbcfc4f46cf40b1445fc2130404ddf8aa84cc167ec75577e1b9569c583ba7611fad189d1275e9bc05f0d717ddb2f90fdffa7292d785150b SHA512 493a39587cf8ed448ebd4884422054da784f26672087bf0537d70ca456c2cdb26fa92ef3286592d024e386362737be6912cde9f4405cb85b926c821881455b4d
-EBUILD guessit-3.2.0.ebuild 1032 BLAKE2B ac46c37a9622fe4f9fc58fe67d374f8c4011d12962c00957201ae54498c45cd0bfff59f999be564c82dcbe3513adb2ff56db91556cca5781e24c774530c2e3b2 SHA512 34795595458158649f0e525af272365145d17d875742abf5373d10b33d963fa00a8e946f5bc1c711e3bdcd80891017380f9c41a5ac2b7909303675c1f7253be6
+EBUILD guessit-3.2.0.ebuild 1030 BLAKE2B 6c9c912637d955c92a67474f8328760a4a55866d63fd59129b567596721f08afab3026d50b26da6287b87c9f516a77105d60c9c32c93cd68047b96e058249a48 SHA512 5b0d1c0b2269b85d6e9a028f4c9db23ac8b384b1147e8629470d6fa636ca0997b484a35ec7e5cef827b226b42d0b19eab08e598097645a6879f53eda44ee48b7
 MISC metadata.xml 392 BLAKE2B fa31237c110d3c600f6f4416685509ecf55f2e90dd4630b6980907703a2d65676dfc0fc36d94ec53f452dcfa393c5e8784af03b2071e0660f5c0597f7c0744f7 SHA512 c1cd9bc55758444324bce57d1bb07c597a95e8552ca14a81b42806cd71df5af343fa211cd1fd9b36a8918ca8b36383c37cb943d6336c74e8df7665e7bb048e7f
diff --git a/dev-python/guessit/guessit-3.1.1.ebuild b/dev-python/guessit/guessit-3.1.1.ebuild
deleted file mode 100644
index 11c9053755b4..000000000000
--- a/dev-python/guessit/guessit-3.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for guessing information from video filenames"
-HOMEPAGE="https://github.com/guessit-io/guessit
-	https://pypi.org/project/guessit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
-	>=dev-python/rebulk-2.0.0[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Disable benchmarks as they require unavailable pytest-benchmark.
-	rm guessit/test/test_benchmark.py || die
-	sed -i -e "s|'pytest-benchmark',||g" setup.py || die
-
-	# Disable unconditional dependency on dev-python/pytest-runner.
-	sed -i -e "s|'pytest-runner'||g" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/guessit/guessit-3.2.0.ebuild b/dev-python/guessit/guessit-3.2.0.ebuild
index a53973ca6b74..b7a5ba657f3c 100644
--- a/dev-python/guessit/guessit-3.2.0.ebuild
+++ b/dev-python/guessit/guessit-3.2.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
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index 607f2401cc0c..c579e4541aa7 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,5 +1,3 @@
-DIST joblib-0.17.0.tar.gz 345984 BLAKE2B 4f4cb83037fc02ce9ea17e7dc5d284235b847eeb90bf1a877c4168aabd9ad4dd762e45a6485806efc759cdfcb98e6ee70e6d9a498cd7645b1d6b0051a9f9ba2e SHA512 73c42a9f5949478a4a03b97ec31549cabca2ebc968d2c869632696b671c175dc85ae7aa8ac92905f13f830083b2305b56df1552f1d70fa7fe51945ae7286840a
 DIST joblib-1.0.0.tar.gz 346996 BLAKE2B 6f31dba31e451fe1d05e7a34bc211b641e10a6dda21cc6a4d283a594744caa3434748a2c2c661c468931e509d815596db18ce1cbed287ae6b0da287490256dec SHA512 3fad2f3d4d6651d2c0376403b3658defc9ae1acf08b2e187f77b440040ad414bf723241d685df862c08b88d784ded915f5794d0e0c29841d9acae4db200d7213
-EBUILD joblib-0.17.0.ebuild 1295 BLAKE2B 4159490004211cb9c47e74c3e1d0417a9da03f23e92c0f2d1fc2ba7ef3bf9fa9297eae6eb5cef5f0572b63bc76e1053042749f7c8873ec8bb87ebbf96f34fc49 SHA512 8d5401249e725031fee5ba9578b2e2fd2f38ca1bb017d729942c86ffc50b898d5bfa5d2ec63c174026aab84b1ce9c2ddf4a8f7a13a69ef6aae272a71a7dffb5f
-EBUILD joblib-1.0.0.ebuild 1167 BLAKE2B fb1a359ccbd2708d3d99785648cb17ad1cf4735dc264e1c7f2b66c4a02dd78e5c9083818804e5386f5a1b6fc963cf92d140a9fef88d71c667e424b917ab668b8 SHA512 8503ce88af920df0bd929e8453ad8da92cd6d5a513539c5de0d2cfbdfb297d723b250a719af11f27834cbc93a33aa3a76cc653cebb6894318f914dcd2168db7e
+EBUILD joblib-1.0.0.ebuild 1165 BLAKE2B 8b5a7d5175750c23a1e98be9e0c5f39133e212eb2c3ed23427e8e63d79bff62f2b18abacfd2f7d0b7c2100503bc7b484c604cc5a7cc42c031fa129b4c00f5c74 SHA512 b55b4bc8eb6dd5524ecb09457b8ef877e27124fc4f790f045f15d377ea9d83fbf00cab1f6e91bd4da9787d4226828467aef53eed60477144e56240d7d294763b
 MISC metadata.xml 857 BLAKE2B 54960e79cd772ee043d09577668c6197ddf0c2b6bbd4cc2bddcbf60ec25fdc9ee3c0a89611ec10d20acac23d69d3a0d4fef9bf225406fb5ba845c3fb6970746e SHA512 ba9709dae22587a7d2c17ff432d05c50f68bc51bf2f7b4e96fec9165304d76862889beafee4feb3a7dfbb5a54e9561ff4c804232a3c9a7dd7384bbd3467688f9
diff --git a/dev-python/joblib/joblib-0.17.0.ebuild b/dev-python/joblib/joblib-0.17.0.ebuild
deleted file mode 100644
index ed2d3ee4efad..000000000000
--- a/dev-python/joblib/joblib-0.17.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tools to provide lightweight pipelining in Python"
-HOMEPAGE="https://joblib.readthedocs.io/en/latest/
-	https://github.com/joblib/joblib"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/loky[${PYTHON_USEDEP}]
-"
-# joblib is imported by setup.py so we need ${RDEPEND}
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/threadpoolctl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# unbundle
-	rm -r joblib/externals || die
-	sed -e "s:'joblib.externals[^']*',\?::g" -i setup.py || die
-	find -name '*.py' -exec \
-		sed -e 's:\(joblib\)\?\.externals\.::' \
-			-e 's:from \.externals ::' \
-			-i {} + || die
-
-	# https://github.com/joblib/joblib/issues/1115
-	sed -e 's:test_parallel_call_cached_function_defined_in_jupyter:_&:' \
-		-i joblib/test/test_memory.py || die
-
-	# tries to fetch from the internet
-	rm examples/compressors_comparison.py \
-		examples/parallel/distributed_backend_simple.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/joblib/joblib-1.0.0.ebuild b/dev-python/joblib/joblib-1.0.0.ebuild
index d0d38ff48ce2..0cfebb301220 100644
--- a/dev-python/joblib/joblib-1.0.0.ebuild
+++ b/dev-python/joblib/joblib-1.0.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index ed6ed378521d..50524aa14722 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -3,6 +3,5 @@ AUX pytest-xdist-2.2.0-services-conflict.patch 1097 BLAKE2B edc3ecb79578f89e9ce5
 DIST pytest-xdist-1.34.0.tar.gz 66151 BLAKE2B ac5274e32b3ef6b72113efd4300eb6946a977e0e202d3383abcdbc022126b7806edb326ddc16abb1219e22eb091e06a9c39fce3031aaf5943d4ad653a47af142 SHA512 69e9877ee0268d71d7c0ca202ccc46b3ba1a9271f0e6e4ac4b76602833f9b7012364eb6924ae994e76c1d48d63adf1702d4c5e6ed5b75c52ac7ebae958210e24
 DIST pytest-xdist-2.2.0.tar.gz 64781 BLAKE2B 17287c28f31c42c6a8fe3622d4ba920a530e0ced3bc99cffd8f9de91c3498cc2a3b654cc32bd5b09ee8ec6c1f64226aec736acafd73397be2eb34bd3d192bb46 SHA512 2027f8512fbd6cb68ab36eb774b9d8b7e855c181733b884f394d0e84994926b4fe6158dbd55808328b262497036f101e71cb86553340eba0031d654f34541689
 EBUILD pytest-xdist-1.34.0-r1.ebuild 1034 BLAKE2B e2573dce203013c0000e8192e72e3df62f055824c94b89ce085a820aeffb186ed7f6c57759c74487678d88912fe58b218498b57a3f388e7525c07fb7866c5771 SHA512 ec4462b37f30387f804e11857f081fc5cba69b271a566659853f2d5bec3321cdc90a316a4e1f884a3623462744775718d6a3d4849202a73a29ff9f4da41b0011
-EBUILD pytest-xdist-2.2.0-r1.ebuild 925 BLAKE2B 12cbcd90e3e05d5072a632d3abc1458ec75c9ca554e312e8e6b9b8e298f8079c108c6267451a3e64aa7b1f544e0ea7db9462b5a6b0024feea37fa4c8573dd0dc SHA512 c94d2b3f9470226891b84e082185293976e9a23776973e5885b27cb5e957ce776dfc546902264ae754aae3ddeffae636e2514fd349e3f78ff5a6de2061b15ea4
-EBUILD pytest-xdist-2.2.0.ebuild 907 BLAKE2B 694350a204bfc1a69c474cbc078c38f9732bf358839cbedd3046f2fcdf53e7e2f2c7702d3632d8d783f7e433dd82151bcdab03c80be148fbadf36f7d816ea106 SHA512 a192670333a92ff7cae28cbc5e85626e02f706d8987cc6d7aeac359e39f9d7b5a2c5ca203d9132f0743dd79094f3d7e52bde6063df7a05ef16da5b5e492541b7
+EBUILD pytest-xdist-2.2.0-r1.ebuild 917 BLAKE2B ba82a931b850881ebb8bdc71223b8301c3b00e59767fb76bec17e5a4ba86aa569dbd906e139bcf878011471fd3c99a5053a7c760e53b20dac3cdacf7d22080b6 SHA512 1922065b4754c83f19739e10e378462d57af202d6fc99241340ee34b4de89c5d39ee0c3ab5da146cd3db2ba992ab0a25341a63ee62df1f19a2263cb198cfb61a
 MISC metadata.xml 402 BLAKE2B 9e24660b4146f94ecdf375e3bd89a9ab01157ab7c7e9b37fa183eaad12edfbb6574ecef4a98e6079b3dd81e6614b5eb23b0bfd69c9468abde7bbc073e8ef44b4 SHA512 7fbab209b81bba0684b9dad109dc7ba64f9c496e5ad69fcbc659f9361aa131f6779a5419a54112b4ff1c2a63a9deef5f36791551165b1b4b7219c7a00fe93060
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild
index 02a5dfc5d4a0..324d6470fb73 100644
--- a/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-2.2.0-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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 # pytest-xdist >= 2 fails with pytest < 6
 RDEPEND="
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.2.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.2.0.ebuild
deleted file mode 100644
index 0f923d6aec7e..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-2.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-# please do not depend on pytest to avoid unnecessary USEDEP enforcement
-RDEPEND="
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/filelock[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-services-conflict.patch
-)
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index c497d9dcb326..c220f8a8b1e3 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -5,6 +5,7 @@ DIST setuptools-51.1.1.tar.gz 2051053 BLAKE2B 182c8c4b4d3bb8caea8cb1812aaff929d7
 DIST setuptools-51.1.2.tar.gz 2051107 BLAKE2B a9f1d5dac6bed7b8744f1a3f023398312f6e3696ea68a84bdb252afca3e88b8617ae632384c18cf49906b1ec97f78f467ec158cc09e1842055b5089e154e0429 SHA512 cdfdb3c3666239268ab225704d1a887f027c297262521ee8d55af547cbcef0931656997cc86f4f9a871df6028974bd90b9eea6177c02bf34f98297415b9c410f
 DIST setuptools-51.3.1.tar.gz 2057167 BLAKE2B 4077e117c33c5eaad4de2bc66db0432dc14064de3f4a55e853541b09475bec81b9a07c3baec77a1574ed7912f3db2c6a83b7dcffbbe9bbffb15de13a928e6280 SHA512 5ae96ce0595bdaaa86fbe916e79b545db5a18278f150da2a38a83e43e891bbce8d4f03975ef0d7c6138b3ebcdb16fcfa4dae80a970007c8c60683fd57edc998e
 DIST setuptools-51.3.3.tar.gz 2053035 BLAKE2B 73b33359f10f900233b82e68c91781609665bdecb6b0e2963d7d15a798149c104030cc1e124ee945b23e5fc8db3f573d0b9012cfba7767ff913077af907141e4 SHA512 5a3572466a68c6f650111448ce3343f64c62044650bb8635edbff97e2bc7b216b8bbe3b4e3bccf34e6887f3bedc911b27ca5f9a515201cae49cf44fbacf03345
+DIST setuptools-53.0.0.tar.gz 2050503 BLAKE2B b1ebe5a9776917fe9a21a13a4db613fd05aa1f61043482487013bcfed7802ff1b984fe0f72623b092eee7ebfb9debd5f71732223220bc2b73a6ece0a7ec86a2c SHA512 d045198210f09c5f2acbd487d3dd291cd7ce814bebe331f1876c133cd28f56d368717c7bd4a875b439c9cc8c9488dc9a7d3e27ab791cce419f78b87fcfd8fff6
 EBUILD setuptools-50.3.0.ebuild 2279 BLAKE2B a18ae61ea5f934d43a3c8897d5911b5b2045d84a5f5e3832457524c4d0872cdf7ec84b22b577e49823b0d0c31fd39d549ba573ba4f0b4ae12bdae850bb464d85 SHA512 42535432b004588cf7b5bf9a6c6707e289ac0c1d4d80a69d7140761410eccad15e73e807987f15c579c8eca25607ca122c88da30c364bdd7832d824f73b9c31a
 EBUILD setuptools-51.0.0.ebuild 2120 BLAKE2B 07b7729e9ca28a8278cca9be535098cf3e1afd79f37247cb99a638eab9f44edad71bca645eef7ac4b5ec5b30c2cc8bec992f5ede2fe037293e1f6f2a2837bd81 SHA512 4990f3d5c91081d96208e977041045507e5608bdaa81f665b8bc324ba6496dcf70de8cfd400db4ca6b181ae39a2a0c8772babeb9b3c9d335aa53c1bf55f714e4
 EBUILD setuptools-51.1.0.ebuild 2053 BLAKE2B ea654ff9b19eadad42038370ec83d4ad9cdb56b14ed416c3466e4cb5bbedc000dc51df2ce781be03d9159bd8153d0e963fa73c2b10939230ab20aba4f9df2aae SHA512 b49541d1e644ec79170aa3784541eb59750ad73b2c315e6ca28cf3053b3b4c30bfdc0310649d252ef42604087b8743d92aff342714957506a5cd81b3fe397f92
@@ -12,4 +13,5 @@ EBUILD setuptools-51.1.1.ebuild 2135 BLAKE2B a26db5e2beca75c56823ebd23b28a196a73
 EBUILD setuptools-51.1.2.ebuild 2135 BLAKE2B a26db5e2beca75c56823ebd23b28a196a738fdb7e949fe6778e3ade928deaa38f3f5351ff87da240139d757c23379d81f179c9c5d111915107682f337cec2c9a SHA512 ddf6072b1d1c303e6084942c3d4f638786f71939acb01e44438a38e3a45ba19fc5f323d072b75a392f23dfde90be2abc2c5c914919afb0aabb13d74966eff234
 EBUILD setuptools-51.3.1.ebuild 2134 BLAKE2B 026061402b07b6aee16e9c963e8af99e35fba7c894c7ef922ab9b2ae5fd0231d42578846985648e8ca7791b3ed83e721dd2d152a59af958e4b54df42bdef39e3 SHA512 a4a912ede611ca6d251e6923625d2ecb6343ce0032ee89015236bdbf6d740fc2876c298e33be385e3a15d42655bc61b4ed4472df27c9b514d1ac60c4f57daf3a
 EBUILD setuptools-51.3.3.ebuild 2134 BLAKE2B 026061402b07b6aee16e9c963e8af99e35fba7c894c7ef922ab9b2ae5fd0231d42578846985648e8ca7791b3ed83e721dd2d152a59af958e4b54df42bdef39e3 SHA512 a4a912ede611ca6d251e6923625d2ecb6343ce0032ee89015236bdbf6d740fc2876c298e33be385e3a15d42655bc61b4ed4472df27c9b514d1ac60c4f57daf3a
+EBUILD setuptools-53.0.0.ebuild 2134 BLAKE2B 026061402b07b6aee16e9c963e8af99e35fba7c894c7ef922ab9b2ae5fd0231d42578846985648e8ca7791b3ed83e721dd2d152a59af958e4b54df42bdef39e3 SHA512 a4a912ede611ca6d251e6923625d2ecb6343ce0032ee89015236bdbf6d740fc2876c298e33be385e3a15d42655bc61b4ed4472df27c9b514d1ac60c4f57daf3a
 MISC metadata.xml 468 BLAKE2B 5f9a9240795261f894d54130ba489bb18fd24f8f95f993b55d23136fb2b518f47b64494d71ab0f697ca64f4eacc8cb58487e8889a8de22e8e3448caba5498065 SHA512 e284933f2a5d11cf7bb483776b8de2afe96ccad15a0e0bf7c9feab05c65f4247c9b19bb60c04d699ba917a637ca470e6ba41a38795899e54179602b587efe300
diff --git a/dev-python/setuptools/setuptools-53.0.0.ebuild b/dev-python/setuptools/setuptools-53.0.0.ebuild
new file mode 100644
index 000000000000..49b44d46c0df
--- /dev/null
+++ b/dev-python/setuptools/setuptools-53.0.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+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"
+
+BDEPEND="
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+python_test() {
+	distutils_install_for_testing --via-root
+	local deselect=(
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		# this one's unhappy about pytest-xdist but one test is not worth
+		# losing the speed gain
+		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import
+	)
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		setuptools || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 57a236a068b1..5c6d51e525fe 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -3,8 +3,10 @@ DIST SQLAlchemy-1.3.17.tar.gz 5979141 BLAKE2B f0fa46493461f532ebca9420fc9f49a2c0
 DIST SQLAlchemy-1.3.20.tar.gz 6264898 BLAKE2B 4c386eff56c2f9ec7ef467e3bc0032629582a970707dc11e3744fe3903d9cb18457f5e0be4dc9c20727b5733f158e031bf8b40f586dadb8f4ab8d0cae3cf7398 SHA512 29c52ada1a66f906ed2563df2ab093eceb7c09de45749c96031f30a1512d20b1d698e00640c777169ef3db99ab012151770a3daea45a51df934269b554ff4b28
 DIST SQLAlchemy-1.3.21.tar.gz 6297278 BLAKE2B 39bd440eec25adc3ec81eaf55d2b97ecb328da4fd6e78dca17a94548a34336a8ef01a1dd0b4565794f4647d3bb4a98803873990c2e0df865216ed57fbe67ba1c SHA512 50ea60b849e6f043507728482dc1a90faea853c3fb16affe1d68197903578cb31f26b3543f4671be6aec2a705343193bfa7579e8d417e74c92ee104af4fba753
 DIST SQLAlchemy-1.3.22.tar.gz 6300186 BLAKE2B 5b788ddadef0b68f440c5c7584320dd0a71d43e288febf0cb35c4683052be0f46174ac17b7c8b22ad0461f1e5f55ef5e6dbb149c49d727c3b42b49f48eb7589d SHA512 5e43af97dd93af8174f14575c8238a72153afa4dbe56503cf934de9f783ea15ad27b25523c147191bd2ec89e25baafab5f5d9c34a29f71eaf4e2de49af5bb887
+DIST SQLAlchemy-1.3.23.tar.gz 6313652 BLAKE2B e87f67ee7ee70036b94e1708c1a59f58b1f8abad23aa26c74e2a9a2172bee5a6411b2be95bff0f1c6e39d3a0de0839adc6b43f4cde597a18d4cf930e4c37b11e SHA512 dcd1a0878fd58ee49691bb7e8a2571cb40cc942380a4fe0e66d3abb1723830f178e7b3944c5c2d69bd3aaff04cd2ca171bbabbe34f59f54bcf4b9ee2782f9570
 EBUILD sqlalchemy-1.3.17.ebuild 1427 BLAKE2B 7a068977d5832b08fccd51075f31608e21c6e234be5443e055dc3f0f20f1016e9c72ed321a3fc09bdd791146a20933d6c9f76b41e25a9ac8ce32488d25faaa51 SHA512 0f00ac700d30e1f8e080fd5ddc07be4173bee454e78a68063c3cc98e9bbe9c2e7d572c41d5cd863e0375c3553a5185144bcd30d4059c3b0d5ed6939a40172b9d
 EBUILD sqlalchemy-1.3.20.ebuild 1881 BLAKE2B 62eccd43feada54889f3829308f3b813bfd9f95da3f99270a8ac8a2600486d029705615f4436bd5494b505743818101f188f4e4315aa1555b8ba6a1e0e25bd6f SHA512 07287e4c7c56ae1f12f928857bbb3298be752a534054386316a79e86c6501212030d258dab1643fef7150b9c4a7e462b0f8e60cadacbda2f81b67a398d42d5b3
 EBUILD sqlalchemy-1.3.21.ebuild 1901 BLAKE2B 6c60421975fba0b2bc5173037bc0e497819fe7918b0e4e0aef8a3a1fb1ef32a2e4352da20ac5eafddfaf7f7b21bf6bd1b864cd09fdedf957bf4a41fc0d1f0dfb SHA512 17282faf6f3a63c36a9d3735eaa896e31058cbcf672671dabcc155fa6246b5b250876790954d0225f2c44e4e8207c575aa7ff5ff2ec1f966c7a7cfb767598f0e
 EBUILD sqlalchemy-1.3.22.ebuild 1901 BLAKE2B 6c60421975fba0b2bc5173037bc0e497819fe7918b0e4e0aef8a3a1fb1ef32a2e4352da20ac5eafddfaf7f7b21bf6bd1b864cd09fdedf957bf4a41fc0d1f0dfb SHA512 17282faf6f3a63c36a9d3735eaa896e31058cbcf672671dabcc155fa6246b5b250876790954d0225f2c44e4e8207c575aa7ff5ff2ec1f966c7a7cfb767598f0e
+EBUILD sqlalchemy-1.3.23.ebuild 1901 BLAKE2B 6c60421975fba0b2bc5173037bc0e497819fe7918b0e4e0aef8a3a1fb1ef32a2e4352da20ac5eafddfaf7f7b21bf6bd1b864cd09fdedf957bf4a41fc0d1f0dfb SHA512 17282faf6f3a63c36a9d3735eaa896e31058cbcf672671dabcc155fa6246b5b250876790954d0225f2c44e4e8207c575aa7ff5ff2ec1f966c7a7cfb767598f0e
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.23.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.23.ebuild
new file mode 100644
index 000000000000..0c7cc3a6397e
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.23.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+# Use pytest-xdist to speed up tests
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	# Ported part of those commits to fix failing tests:
+	# https://github.com/sqlalchemy/sqlalchemy/commit/c68f9fb87868c45fcadcc942ce4a35f10ff2f7ea
+	# https://github.com/sqlalchemy/sqlalchemy/commit/a9b068ae564e5e775e312373088545b75aeaa1b0
+	# https://github.com/sqlalchemy/sqlalchemy/commit/9e31fc74089cf565df5f275d22eb8ae5414d6e45
+	"${FILESDIR}/sqlalchemy-1.3.20-pypy3.patch"
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Use all CPUs with pytest-xdist
+	pytest -n auto -vv || die "Tests failed with ${EPYTHON}"
+}
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 66c43c6b4b61..bf8d344b29b2 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -6,7 +6,7 @@ DIST urllib3-1.26.3.tar.gz 292598 BLAKE2B 31bcf03debd74a65004484f12c9ad4d71b8c06
 EBUILD urllib3-1.25.11.ebuild 1879 BLAKE2B c6a79fb4d9b36011fa0c0602e2853c1f8f289e3e87ce04da163d6c4af39654f8fe47e98c380c9e6f66f749118be3cdf237b66f86eab599fc0c0fc695a26ebdce SHA512 ff5c93995e8dc5c6b4a62e3c8035629ee79db816807a81805bc10dc4b30e51e0ee87fb47f51d13755f1097ccc1c76c26a69a0fe7f432fbd5ea3ac312d2783385
 EBUILD urllib3-1.26.2-r1.ebuild 1988 BLAKE2B 26f5b04b66559676c61460323f2a3a53ebd802581960ee674a76e7a73976f2033540375fbebcfa73b3632ae1c614fc7f649c150a324219031037a84c789b4549 SHA512 edb984d5f3733124863f20d7da469963980b14fa54de736947ddf5109e73aa86d27b9fadb9cd5e7c7bc877d704f56976d829add6880168a10f6aab4a2f5283d7
 EBUILD urllib3-1.26.2-r2.ebuild 1930 BLAKE2B 91598ad9fafe2c16e899efbce7c7d51b918b8b7ca25c421ec10541b2e3198c64d0403e41e06ea3bfb18b5012d943385bd249cb08970ea27015b8dcecf19c0038 SHA512 6d7efbb902fcf41841ae28c8e3a3444d10a6245d7f7014efe5b38c30c7871f730b20423070e6889306d595a369a5114bb7432fe3bb54edb8a18736d0c133af22
-EBUILD urllib3-1.26.2-r3.ebuild 2341 BLAKE2B d3fa1cc03402844aefe65eb925ae1ac1425478130ce6a89f3216fbc14805d2cfaa53279e83ae5ab4a54948c7252aa27411fff57262a31c61ee464b902edbb161 SHA512 432c2cf8f79d912c79c2c7b6df6a7e1755f5dfdd615894b897db4e3f70a511432042ed9cb456691ca24b533b7d23ac65dfb84f7d568ff813766b360297108a15
+EBUILD urllib3-1.26.2-r3.ebuild 2340 BLAKE2B b34ba44a5644a390233ace8419a8a55fafc5496011dd0e829aa002a38d9237f6c5b9768d014ae2e1499548cdda989e3409d62dc701b0c6f921071891c84e2b21 SHA512 85222202a5a900ccea3a749946d9fbf63dc0bc3bd1a8baeb7200a586c3e1cf14c9b5e384077157373c13a53a8fd50feb3c077e2f36b0aed36e0740eed437906d
 EBUILD urllib3-1.26.2.ebuild 1891 BLAKE2B 323e3851652351ba52778954d3d9731afd4846702049e14497836b250b352b4176daf83f1e4c45d8ab141474df2693dccdfbf4bba371ece5f47f1f351bdcd3db SHA512 e427406ad6efbdf95dc470f3c9864c52c70374bda2958b447770edff68f67f5fd00a2cd91b4c5d79070208d485cc0a6b1b380d3ad153cc1fdc7c96e50d264da4
 EBUILD urllib3-1.26.3.ebuild 2231 BLAKE2B 2165ebd2186b82d08ce9ef95cdf55d5699c93fdefabce64c72a99f3a02907749fbdf007091f71b868f810f01d4aa7b6f6db43dce7466deb9c957a49f044f26e3 SHA512 ed8e5713575f459c1a1603a67730d2b14756d5d2ef4e29f78432f57d84af1ba3c0103da00d2df94ff3d1de020de09b7e5bca18d94b6e61c2240631f96086455c
 MISC metadata.xml 530 BLAKE2B 148b6a1936566b905f38f00ec231a832e827bbdd4f6c2ceabe521779b08c1dbf60bdfa182234e8e67b6708efadd09d29e93c151f7c3d1d4fcd5ece3e3d9c0839 SHA512 9ab9fa9ecb34855be0f6e7914f70eadca67854fde865765b1257feec6c841bccd8276ad81f8d9bbfb544ca753c3d27681d6cc841cee008efca5ba72f5a236f3e
diff --git a/dev-python/urllib3/urllib3-1.26.2-r3.ebuild b/dev-python/urllib3/urllib3-1.26.2-r3.ebuild
index 823fc2747f0b..71a701f00a28 100644
--- a/dev-python/urllib3/urllib3-1.26.2-r3.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index a4b089544e0e..39c909c57d24 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -7,10 +7,12 @@ DIST virtualenv-20.3.0.tar.gz 9074217 BLAKE2B a5a00e39e31beff84e28e66d1cf6693804
 DIST virtualenv-20.3.1.tar.gz 9077527 BLAKE2B 9932c75ffd42c2448a3f5dc49aa8b31f7cd169cc671e225a97fa75fabc3339728d0b280abec9616c11fc869dc696bfd17da05bf911c6f8a14947d710ade86897 SHA512 ee95e851e9e3597fd1691086d1d4dc72a41d6a143e9644be208cadbc1dfe7c8e562cd506a657ba1f77161d8d80a9f6f648b345e6533265b0e989c7ad39cc7680
 DIST virtualenv-20.4.0.tar.gz 9079287 BLAKE2B a3c97537b9c35b463a0077e6020fd087a1cf7c22302ab9f57a7df951bd68d3b0e1bc323cdf12a71ca0fdba938364dbd970467d4f9f768ee688a5d9709949b08a SHA512 4dcc141441626ca2a565c1b51453ef0b7a05016037c44ae1017269e5b2ea98fb7fb29fb9cf3f8909a377824b5e52c5b40d2592e40931d8ad63ad850b8e5f23ac
 DIST virtualenv-20.4.1.tar.gz 10578390 BLAKE2B 6304d9296c69da098e2f348aeaa42ad46217975070661f4233a8e8b3c733f366bf2a44eaa887269923a1d0329aa06cd4095342025b595b2d8a0c31171c6b1264 SHA512 7e95174de155fa1b3671cfaa7c5a122dc0626f696c033226c20bec37747fd3c270ab2f843e83da91fc8a6bce53712f4eca5b8fb3d94a92e3ddc19f7e43cb83ee
+DIST virtualenv-20.4.2.tar.gz 10578406 BLAKE2B e9b50a40407954c411076244c09a57601553c16b750231ee451e1954a91f1c18740804246e3e4ba2ff55da021e976cab80da86a1b9d01e3cd3d494aa95f07129 SHA512 3ae13f0ca2af8be1cd95affdbfe58d43f930cf616a38963252219d4efc2523b1c3e8d922b3ab2200ac4cadc76c1237ddb4828ac15b5122771e96f7401a852d4e
 EBUILD virtualenv-16.7.10-r1.ebuild 1846 BLAKE2B 59818b64498cb3ef09d0b95b32e24873faa5a0760681362ebfe5bd3fdd6b1cd914ddb1f0604b5b7bf22ed108f0b096ef7e2a738fc9717ee6dc4260a45f46a882 SHA512 e7c0fe99c605ad2dd5c0c83f168ea70dab48973134c8819924f4296ffacefccc017048f237506024b9c8ee4a84580a31ca76370ca8eea9f6c079f0eca773e37b
 EBUILD virtualenv-20.2.1.ebuild 2586 BLAKE2B 92b28643f7174cadd031218df76aa54358c0fec4300538e835807099ac7c47e6d19ccb67a55f47d3db9c2c30c0593e530fd5ff51c6c7860b89cc2c2d7b4dccf2 SHA512 c368563a3933f74c6affa1340c4f5fc6f0a0dba6571302c66f34432d81e855c72bab07b66e773f7c27fec3d5f319109891dc8960434e233fd64482d12366f5b3
 EBUILD virtualenv-20.3.0.ebuild 4022 BLAKE2B 1442ddc8caf848c8e229d018199176d4d8c0442896e682f193a94d9732b0edd2289b782f47348cdd9cdcaa484f9abb59b2ab9654ba8ef6eb0735093facdd3c70 SHA512 35b6f5530a6995f78a1dcfdc92b351585924afa8b4afed51469fe6c6e598854281536af18f035e54b0d1218b42168703d000189b41e10d1ad19fbeb4248c9b97
 EBUILD virtualenv-20.3.1.ebuild 4022 BLAKE2B 1442ddc8caf848c8e229d018199176d4d8c0442896e682f193a94d9732b0edd2289b782f47348cdd9cdcaa484f9abb59b2ab9654ba8ef6eb0735093facdd3c70 SHA512 35b6f5530a6995f78a1dcfdc92b351585924afa8b4afed51469fe6c6e598854281536af18f035e54b0d1218b42168703d000189b41e10d1ad19fbeb4248c9b97
 EBUILD virtualenv-20.4.0.ebuild 4022 BLAKE2B 1442ddc8caf848c8e229d018199176d4d8c0442896e682f193a94d9732b0edd2289b782f47348cdd9cdcaa484f9abb59b2ab9654ba8ef6eb0735093facdd3c70 SHA512 35b6f5530a6995f78a1dcfdc92b351585924afa8b4afed51469fe6c6e598854281536af18f035e54b0d1218b42168703d000189b41e10d1ad19fbeb4248c9b97
 EBUILD virtualenv-20.4.1.ebuild 4022 BLAKE2B 1442ddc8caf848c8e229d018199176d4d8c0442896e682f193a94d9732b0edd2289b782f47348cdd9cdcaa484f9abb59b2ab9654ba8ef6eb0735093facdd3c70 SHA512 35b6f5530a6995f78a1dcfdc92b351585924afa8b4afed51469fe6c6e598854281536af18f035e54b0d1218b42168703d000189b41e10d1ad19fbeb4248c9b97
+EBUILD virtualenv-20.4.2.ebuild 4022 BLAKE2B 1442ddc8caf848c8e229d018199176d4d8c0442896e682f193a94d9732b0edd2289b782f47348cdd9cdcaa484f9abb59b2ab9654ba8ef6eb0735093facdd3c70 SHA512 35b6f5530a6995f78a1dcfdc92b351585924afa8b4afed51469fe6c6e598854281536af18f035e54b0d1218b42168703d000189b41e10d1ad19fbeb4248c9b97
 MISC metadata.xml 405 BLAKE2B 65152299182652973b0a6387a690d6e04066d9ac05167d6f0ef7d27036813a793503d16e65514093869ed596227123f493dfdba021a094b0021b6c5b98cc0cf7 SHA512 13db4a863e2a82bae1d177967fc45821a59fddc9afc5c9bbbc0abf64fd2c57cb1f7053443d4721c3c91b6562c1b3844560fccc5853f14bce387aabc620167eb6
diff --git a/dev-python/virtualenv/virtualenv-20.4.2.ebuild b/dev-python/virtualenv/virtualenv-20.4.2.ebuild
new file mode 100644
index 000000000000..2b78ff679af0
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.4.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+	' python3_{6,7} pypy3)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
+	' python3_6 pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/coverage[${PYTHON_USEDEP}]
+			dev-python/flaky[${PYTHON_USEDEP}]
+			>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+			>=dev-python/pytest-5[${PYTHON_USEDEP}]
+			>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+			>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+		' 'python3*')
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/towncrier
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+
+	distutils_install_for_testing --via-root
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 1771ec0a3419..077c5e584dcb 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index fe6654053b55..25d4a633ee71 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -5,10 +5,12 @@ DIST i18n-1.8.2.tar.gz 66623 BLAKE2B 2bc2a6174ae9b6a3342d925d29501e9cf959bf78f68
 DIST i18n-1.8.5.tar.gz 67840 BLAKE2B 977bfd086c83f86a47413a5d332f09ee521fc269f4e333721ee8bf71334cff001975fe3a31fc84e600b34d0037050e00afd5f59db5a51b566d8648fec50de016 SHA512 0fd51cdc059c17b1581d187f39149bec1de4bcb06e6c9867f084fce26a8d6a6570b0058689cc30ff7ae14ea562b64ecdaf10ab3d4d2fbe246717583ca20100be
 DIST i18n-1.8.6.tar.gz 67932 BLAKE2B 779bbfb042777abd44d157c2bc8d716afbd3b1a20da3252007eae1c455cf38b1480f6e7e0d3a8407d239139d22cc50b9a6c472943f00fddacc8e48e4800ed10c SHA512 74088250e84390267dfe1eef84235e1dfc8546fa64bd49ddb76a46b363ebc260d4c18354cee6cdefc1ef79360a1e9186096e900dabba19f61cdb948f1ec6287f
 DIST i18n-1.8.7.tar.gz 67999 BLAKE2B eb0ec1bc8ae1fca99756b197f8a91b9fd7b72ea9b781b1958085ea4caaf93f0e1af0c6b70508669958b74859093d941a8e58a10be40a4ca3530db2e18a43da4d SHA512 bfb12cb1565e3eff597639199d807cc3a468cc29d1afe48a4448ea7e100fe9684c6bb1ddfc9cd258c64efb809f7bebd077fca390e16058f468511f430ace7468
+DIST i18n-1.8.8.tar.gz 67915 BLAKE2B 2f169a5c04218f4aa9e2ad3e702ba5c178619126c52aa3b436d1026c15265e98b3bc59ba65cc1db715601d06e982b89f24452f2e27a00f310cf757ec34fbe3aa SHA512 0068764336f81e704d18f9c920d10279a21145f6a22780b7678e2dbdf31bb00739b30b2e5c99a57da3caa6e9f38e77bc6d0a0624f3b2d61c367733a8373261e3
 EBUILD i18n-0.7.0-r3.ebuild 1611 BLAKE2B 1484a92ad9f46fd5ce3c2a98370ce8b66c8752b0482d1a67f411240a0fe1adf9a12af121ac7a5fef1792f791929525c504ce377b8bca89993da4d68a1c26603f SHA512 991a21901760e6c88503b8f144a6cb14af57de2d2ef90856177ea3b0535635c2a6c7573def25cab1c56283e28b0bc8a4706822ff727e4dc1d876eb2eb5fa62e1
 EBUILD i18n-1.7.1.ebuild 1512 BLAKE2B a07476ace177e5bbee177b169920c6bef85d90f82502e9696bb8099f03eb5f745e1bd2e7c07cb41a650e08ea51afe739bcdea24860b675a1dedbcae6c4fc92bb SHA512 1cf2fae5715fb454b73b73304548ed7d9c170b395122236db6bec52deceb2b5db8792c56dc3bfe14eab96330fcdcbea97a83594dde865b62c79a359760d4d0fd
 EBUILD i18n-1.8.2.ebuild 1513 BLAKE2B 4bda6c55e2331a18543ba8cd36cae81e5a1c82b86caf710937f2b64825083c52465a55163a7c0651a6731b010f97759dc4eb6f4d3625ede766f96f6ab101fd0a SHA512 fca0eed032c5a97b6909785c4dd611e8a252809ede2432465033ede1da00673d3630054bf5917a68cfdab0c7000523ebd56b619ee56d2343556fcb657b240fc5
 EBUILD i18n-1.8.5.ebuild 1554 BLAKE2B 01ea2c6fd2cec8c6e34a81e377138445eeff6fd3c658dea1f48f1fdc101fe5dc0c0064496753da5a918af47fb626eb8006f1d1120261303a65ce38ddbc34d00c SHA512 d0ca2c9fef218f5a97e065b66789fac5d8da8a8b4fb6e30e68b0c7dd30971e8dab3c03d6170b2af1756591ca1eaa3e454c79c9c1493f37d2066e43d7ff21f467
 EBUILD i18n-1.8.6.ebuild 1555 BLAKE2B 59a324fa7eb34034b4439797c6c65446eb2e25f095fe70727bbc9c00535f7afc1fc6412b2afa77b212f1f9ac385aa16c1f715543441dc68d3a8577ba0487ddd2 SHA512 08172d79e8bb9f1f87dfa46bc19835677ee5c02a0fbd14660bd9e7fd0687081fe200444fcbda2b6f006cacc2627c982ef7c8f2bc01bf271f5f1e808005550d72
 EBUILD i18n-1.8.7.ebuild 1555 BLAKE2B 59a324fa7eb34034b4439797c6c65446eb2e25f095fe70727bbc9c00535f7afc1fc6412b2afa77b212f1f9ac385aa16c1f715543441dc68d3a8577ba0487ddd2 SHA512 08172d79e8bb9f1f87dfa46bc19835677ee5c02a0fbd14660bd9e7fd0687081fe200444fcbda2b6f006cacc2627c982ef7c8f2bc01bf271f5f1e808005550d72
+EBUILD i18n-1.8.8.ebuild 1555 BLAKE2B 59a324fa7eb34034b4439797c6c65446eb2e25f095fe70727bbc9c00535f7afc1fc6412b2afa77b212f1f9ac385aa16c1f715543441dc68d3a8577ba0487ddd2 SHA512 08172d79e8bb9f1f87dfa46bc19835677ee5c02a0fbd14660bd9e7fd0687081fe200444fcbda2b6f006cacc2627c982ef7c8f2bc01bf271f5f1e808005550d72
 MISC metadata.xml 340 BLAKE2B fd50e1569f22c70ba423cfd181cdfbad5348aed4ffc751ff04d38db0e3c64ec0e3d7501fd134401337337549509f7501a23e36b8a9bdd99a18a374885f8c8596 SHA512 09bf74eefe2371ac635fe302efe1b928e37cf0e1da0979f629085f357bc3e93ea87407781ad172139166f21cb979dbbc7e1bec013f8fe0a760cbbe94ab23ac64
diff --git a/dev-ruby/i18n/i18n-1.8.8.ebuild b/dev-ruby/i18n/i18n-1.8.8.ebuild
new file mode 100644
index 000000000000..b4f94ae7c427
--- /dev/null
+++ b/dev-ruby/i18n/i18n-1.8.8.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add Internationalization support to your Ruby application"
+HOMEPAGE="http://rails-i18n.org/"
+SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/activesupport-5.1
+	dev-ruby/bundler
+	>=dev-ruby/mocha-1.7.0
+	dev-ruby/test_declarative )"
+
+all_ruby_prepare() {
+	rm -f gemfiles/*.lock || die
+
+	# Remove optional unpackaged oj gem
+	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
+
+	# Update old test dependencies
+	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' gemfiles/* || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby27)
+			versions="6.0"
+			;;
+		*ruby26)
+			versions="5.2 6.0"
+			;;
+		*ruby25)
+			versions="5.2 6.0"
+			;;
+		*ruby24)
+			versions="5.2"
+			;;
+	esac
+
+	for version in ${versions} ; do
+		if has_version "dev-ruby/activesupport:${version}" ; then
+			einfo "Running tests with activesupport ${version}"
+			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
+		fi
+	done
+}
diff --git a/dev-ruby/jbuilder/Manifest b/dev-ruby/jbuilder/Manifest
index bc0aeca1bcfc..a313ab21bef6 100644
--- a/dev-ruby/jbuilder/Manifest
+++ b/dev-ruby/jbuilder/Manifest
@@ -1,7 +1,9 @@
 DIST jbuilder-2.10.0.gem 28160 BLAKE2B c277a59d53f30132ebe88d6afda5c221d74a399b01cedf6a4863f29e94d329137669942957a21ae9c5c192177dc9e78b6d66d9b5a29c7d4667a0432556c6b28c SHA512 a429422d65ed3eec55f46597f73a97b267fe7d6c7554ec6a6d60e1e1c0a9306b81f7283524602a30af11a141f7cd466a0f7b0a804172bd4008787462f0fa4ffc
 DIST jbuilder-2.10.1.gem 28160 BLAKE2B 07bde14ee6a75b5e1cec8ee1fead688c613e76713d32d419433b0f7163a9622bcc48e4b36333eb06960a9a566784d7f31843d71259226539fe569cd178315d55 SHA512 340e9d9cff969294e22a3eea57001e69402cd47b791660a1468702e046edfe4a3cc4f8fe18b87ba63e13352d020cd8fd78fcc070a287bb8da108c531f4dc22a5
 DIST jbuilder-2.11.0.gem 29184 BLAKE2B a1a98df2d81e3d894f82a9862229b0c1f2885f3874084a9a7b1b2d8aecaf48db6777051789d3006448a22d7bbf9e7cd51b8fdf32f8f582551b4fd861d92acf32 SHA512 e76d83a39ae11f4aab5863f87630ff36fff8ef7dc0231da058b0033e80088816b33f0d061859f516ffbb1d965b26e384b233f2c0ebc6d75aa96acb411826c16c
+DIST jbuilder-2.11.2.gem 30208 BLAKE2B 48378a403b1949fd4dd66f468927ae9ca76ddcb88d2929ffb2c9c87b9c4d4daa4bfc147f22fc2d3578eae61e3391ecaf7dc49c324aff09c2884adcdb0aef5113 SHA512 1608649fa7f67dd09b5ac05f2e93aa78a8c25a8f29df1bacff7add554a2cb104aadaefef4b98a279a8d01fdc70372729ca05e716c81bfa55adaac7f7cfe78386
 EBUILD jbuilder-2.10.0.ebuild 614 BLAKE2B 4cc2fe888b7be708ede6be6de5e9c92e7ba6fa2545f14c73efa5b718dfdad2747e8d726adee41b27961de6f81e8832388c4421003944af48556195f5bbf8a856 SHA512 2d4a6439dd2e6fc4ff9c7e9f024c1491b32d5a6d3e3d7ef70fbb270d120cd4550364762d6d3c66c65875c7cad43221af1ef16f5a089402658f2f27f27f64cf6e
 EBUILD jbuilder-2.10.1.ebuild 644 BLAKE2B 89850b0a764f25a24d1680206aeb4b6bd1ac7a531fb6d46245790ca5c640185802f05d6f2076dd957523ca22a1ae39d8729191e6f8df88a2c338836b5be6aefb SHA512 db7d0a374a0af947ff8a57873e177e883cdf279eb6c114dc5298316417d52d05b69b16a0f42254887d45ee0ac58ec4aa3560fd6885a60adc117084981e6a5c55
 EBUILD jbuilder-2.11.0.ebuild 644 BLAKE2B ff34c4bfebc0a3a8e80c940bb4ee13a7ad1813c6a9940cba2e797ac528df8479db6b1d4caacef1fc6190930de8a2a34e0fe00d6f33b92a85251ad37fd0406351 SHA512 d8a390abd926c804ea13a4f78b2caf1880b64d771791b02fb88b0ba563c86044ce107b7e6ce8abdde08663278ae4c87c08a48f232a1245ec9742f35151f969b9
+EBUILD jbuilder-2.11.2.ebuild 644 BLAKE2B ff34c4bfebc0a3a8e80c940bb4ee13a7ad1813c6a9940cba2e797ac528df8479db6b1d4caacef1fc6190930de8a2a34e0fe00d6f33b92a85251ad37fd0406351 SHA512 d8a390abd926c804ea13a4f78b2caf1880b64d771791b02fb88b0ba563c86044ce107b7e6ce8abdde08663278ae4c87c08a48f232a1245ec9742f35151f969b9
 MISC metadata.xml 326 BLAKE2B 205ea196c26e50f19fae65cb1b0cbb295b08406f3fcd6bb51162f52c48aef883b05aeea5092100e53f00ce2dc5f8c5f5a0c32c810af822b6b4ea0d95730e1ad3 SHA512 935898503cbfde9f698968794d20797e973227e1441489359520aa0ec2966c7cfb8df8c9b64ae4738cb55393ae4d001f38eef28cf379fb9e7ba29feaa18cd37d
diff --git a/dev-ruby/jbuilder/jbuilder-2.11.2.ebuild b/dev-ruby/jbuilder/jbuilder-2.11.2.ebuild
new file mode 100644
index 000000000000..8010602aa4a9
--- /dev/null
+++ b/dev-ruby/jbuilder/jbuilder-2.11.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="TRAVIS=true test"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Create JSON structures via a Builder-style DSL"
+HOMEPAGE="https://github.com/rails/jbuilder"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/activesupport-5.0.0:*"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/activemodel-5.0.0
+	>=dev-ruby/railties-5.0.0
+)"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile test/test_helper.rb || die
+}
diff --git a/dev-ruby/mechanize/Manifest b/dev-ruby/mechanize/Manifest
index 7bd98bc0fd71..d5c59c5cd151 100644
--- a/dev-ruby/mechanize/Manifest
+++ b/dev-ruby/mechanize/Manifest
@@ -1,3 +1,5 @@
 DIST mechanize-2.7.6.gem 138752 BLAKE2B be4e8f53c3ad88ae5aac867f836a20b5bcd47aa61db07e2dfb7e2d0c72d368ddfa620411fdddd5c2a408eeceb3c4c1ed3a15f6086ec846cda3a3c3808977309d SHA512 e89eb75af169ba198e5a82ffe4ce3c0962bc3fb6793f88bc735b647b7816d0c78d8968c43d213071e017e7f836ab91ed0c546c9eb986647355a1d38b1ba18138
+DIST mechanize-2.7.7.gem 139264 BLAKE2B 9a60b65fce16058e24e40ec50433653975b41210d3e26a560f6c3627c3de363c24fc0bf3325548dba87c9aaebebbe7fe9bd972c422989e5968e0447cec13fc94 SHA512 759bc6b2da8e0288edbe484b2ced02ce6ef49686a7a4c4ab0065e0f88799d23bc536a0ef160703726e83136857e893135a222aa295974e12f2b6988ecfbe7530
 EBUILD mechanize-2.7.6.ebuild 941 BLAKE2B ed0159649eaaef2b4b5876ad2e74b001e1b50e705bcc544a50498e8334fa3312e828726b935b5c90e56e99ecf4f7292243709fd296b8bd8a8000e88ec2afe39e SHA512 6c966eeb10966a4b9ace5b43cade913be1c2b00bfeef864d3a55fb6c240029c3440801a12f6fb958083acdf379bc2cd685e27ce518470394ea703fd7966a7d40
+EBUILD mechanize-2.7.7.ebuild 922 BLAKE2B 0b17bf0333d05c37b42989e46ec845ceecaddf72fde50553b43745c1d81b517ad01ee78a01f6513a7ca8a455ca50c486919455ed18c1bc2ce428adf4be6d5ae9 SHA512 2ef172c1c7dd202da2468c0c05dbeb631fdc8e4289577610e1fd436dd7a673bd531a7a71ada8d4d96acca5cf636b83e7d124f50ba013ca11a0a06fe72f9fe483
 MISC metadata.xml 349 BLAKE2B 9d63a73c5a28fb2fcef06d4c7b8da3b24d108534b999e76d0d1df86bdfe615e53248deae3d9450824c700a0740b75d0f7c897c8a8c9e5b4339021e30edab51de SHA512 1bc38bd045fa219ec2c86bd942055c0188561fee4ec5e7e6ba4ad2268f653fdeaac40122ed0605af7d47f8dfceb0781d65aeb68bf2fd62e3b8ae5a939f61076a
diff --git a/dev-ruby/mechanize/mechanize-2.7.7.ebuild b/dev-ruby/mechanize/mechanize-2.7.7.ebuild
new file mode 100644
index 000000000000..ae147a5b8025
--- /dev/null
+++ b/dev-ruby/mechanize/mechanize-2.7.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc EXAMPLES.rdoc GUIDE.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby library used for automating interaction with websites"
+HOMEPAGE="https://github.com/sparklemotion/mechanize"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend ">=dev-ruby/hoe-3.7
+	test? ( dev-ruby/minitest:5 )"
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.6
+	>=dev-ruby/net-http-digest_auth-1.1.1
+	>=dev-ruby/net-http-persistent-2.5.2:*
+	>=dev-ruby/ntlm-http-0.1.1
+	>=dev-ruby/webrobots-0.0.9
+	>=dev-ruby/http-cookie-1.0.2
+	>=dev-ruby/mime-types-1.17.2:*
+	>=dev-ruby/domain_name-0.5.1
+	>=dev-ruby/webrick-1.7:0"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/net-http-digest_auth/Manifest b/dev-ruby/net-http-digest_auth/Manifest
index 9eb5f14076b3..5b9197044360 100644
--- a/dev-ruby/net-http-digest_auth/Manifest
+++ b/dev-ruby/net-http-digest_auth/Manifest
@@ -1,3 +1,4 @@
 DIST net-http-digest_auth-1.4.1.gem 13824 BLAKE2B 537688c7d83408052d3d5d16d625a51434dbdc452cf36ec5738917b862eab305a85d3f3933d79d878356a76ae698d6eded24249b70e507b2d7131d71b5dcc482 SHA512 db62d49815a96cabde5836b00a1df58d6277f9efafae78e27296b1e2f4410ea613aed2181f8e39f08af5bbf6f5f758d682e1250d0afd4fe8243fb0d5c7fe78b7
-EBUILD net-http-digest_auth-1.4.1.ebuild 673 BLAKE2B 034c2119310dbdfd8c74ab733d2a2692b784f77aada78897d8141a910639dc32bf9a77bba20f981b4a796badb4e32e954cc07f595232cd9677b7bdf23026a841 SHA512 99106817736e93f6e8c0661039667e8f6b9783685f34a8d6facec51f9bbb18808c7a76ce9f9b297279ed0c43ce8b1ced697d6876c470317d5f8686b60711b67a
+EBUILD net-http-digest_auth-1.4.1-r1.ebuild 617 BLAKE2B fe32621f09a8fd4a894a45dab8f41ea8e7c31bf48adca3d9018a7155807510951cf66bb71cf1adba85a23417697d510c8bd217e01163fbf9476999d135cdd506 SHA512 c456f86797011a40c19c1547adafd936c1fa620b73626e61087e223aecdf1c2188bf35a51a689a5bb31480ba8ce7d2d3cf1c160bbc16bc9049c49485de3613f5
+EBUILD net-http-digest_auth-1.4.1.ebuild 666 BLAKE2B cc8611e06225f51a63ed2f0132655b543302f6ac0e432d7b22e25ffa7fb016ee12430da1d77015fd4c0dae4768162b8025ca836a04a3f367f04ba6091c7539e7 SHA512 8e12ad1c1c280e3352a6ca24d620f70a2767b4d305c02b47a981c76a9feb8df865af19d40a2ee17daddadc63a241d965ef4d1b9efccd124db458a9e483ed72fd
 MISC metadata.xml 354 BLAKE2B 912fe468f23b89ed8692e3978fd9de52071db9870ca8dce72c595bc2058bbbc36fd5913c07c54c816d8633e6ac013d02f73b67f8d29e38dd6265fd1ec537ef88 SHA512 d7ddea8f222b8d515bc33b627acb53d18c54ecd8a1fdf44e5d1c51f0ef633d63e607cd9dccf36cdd94fda819a27785235b43152ddfb94fff615c884013a3f53b
diff --git a/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1-r1.ebuild b/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..52b2b62e979e
--- /dev/null
+++ b/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An implementation of RFC 2617 - Digest Access Authentication"
+HOMEPAGE="https://github.com/drbrain/net-http-digest_auth"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild b/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild
index fa7c2dd90474..a8b4de7219e5 100644
--- a/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild
+++ b/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/rake/Manifest b/dev-ruby/rake/Manifest
index d2a5b937bf2d..e3b6d2aade9c 100644
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@@ -6,5 +6,6 @@ DIST rake-13.0.3.tar.gz 122825 BLAKE2B a36cc6d8e5f560bc502455a756b89d763899e71b7
 EBUILD rake-12.3.3.ebuild 1262 BLAKE2B 1d6dcd738a78d78cc1594ada8d551dea2d365e14f9f62a9d2fc8fb5c6e34ca8cf7c6f3e302ea9786d40772b4f6d7eb677e2ddbfa20a40bb3f19443ef9d0be8c0 SHA512 a38c5335b4363d37553d52afa7e01c53569e0c2d8e53023ad215d46886be7150a7600718a32ed0b6fbc7894c4a79f53924ec7d3273e7d7eb69b86e7fefa3e400
 EBUILD rake-13.0.0.ebuild 1440 BLAKE2B 3cd568481985f897a051329b02fbd011327cb0b0b18f3c8e5c6bdcc29732d00403e191f5cf09affadfd0f41b062aa36b4039554506e2681b012df12fe9794096 SHA512 2130e165851c685a59be81b45511ff689296e76d8bacb3dbb504bc35fc461dcc2cec76f5055d9889c4a6c08d82229d84a495e61d9df0aa73cd6fbd26f6d95e9b
 EBUILD rake-13.0.1.ebuild 1447 BLAKE2B 877bb61e85fb6eaf829142fd0f68176c1ab9bc947d2bd0da4b6d6c7f21cd48afd0cc307cc44e322c5693892ddf4593ca736f5e45b9e0766e766f13550ae3ef3f SHA512 54be8b3e195f8960844b38ae3171b50ad73ee71a8903e24e2eda6df2a7b49a523d1c67543e892dd42d2caf424381ab5e4930a75e2140af81dc6a152c8b5b8bcc
+EBUILD rake-13.0.3-r1.ebuild 1455 BLAKE2B c08d008ddd4c9fbbcc0bccdbeec69cbdf74eacb0a35a5f2440ee09ed4f02f926c6b15251f8ae3aa6a9fc4a8e70ae85c75505992acf78edfabc17442efab0157a SHA512 d0992df412ab18f7d724658f226c5cfded487417b0d27b44b3cfe6301da9f4a584de6a5df862c5fb1d079ae0f9945ee440b539d85918941ab14c4a5f1775cea4
 EBUILD rake-13.0.3.ebuild 1447 BLAKE2B 20142be6848ce363e150b6d3b36611e99077794de5ee4ac7e22667e70245252ea5ae2c44243f1146405971ef31fbc74ae119e22e006e89e1d1c4bee894565db5 SHA512 7e6d6b6e16de8ebfab69c887d65751aff7c5902a3975bd99882ee060a0697391c58edd1c073d799aeec8fe0481d6e19bbad70b2116bb1ca67e6bc27e30a60158
 MISC metadata.xml 341 BLAKE2B 4f6fce5484dd3adf4b7025f95d26ecd9f2f435d2b5e5774cb3f6ea2ea07727d4d76ef640eb039aafe67e5597b70d22258d0f8f939471af2057f0f933250098e6 SHA512 56fc95931062163036dde73847a796fd5802ff4bcb8a8e72686847537d0f38c9d15e0ec83bd06c2f86ce92952e9fbaa0e90eb4633d7afc460adbc0c9676e0040
diff --git a/dev-ruby/rake/rake-13.0.3-r1.ebuild b/dev-ruby/rake/rake-13.0.3-r1.ebuild
new file mode 100644
index 000000000000..b458f2fc2d14
--- /dev/null
+++ b/dev-ruby/rake/rake-13.0.3-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rake.gemspec"
+
+inherit bash-completion-r1 ruby-fakegem
+
+DESCRIPTION="Make-like scripting in Ruby"
+HOMEPAGE="https://github.com/ruby/rake"
+SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+DEPEND+=" app-arch/gzip"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.8 )
+	doc? ( dev-ruby/rdoc )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -type f -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_compile() {
+	if use doc; then
+		rdoc --title "Rake - Ruby Make" --main README.rdoc --out html lib *.rdoc doc/*/*.rdoc || die
+		rm -f html/js/*.js.gz
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.8"; require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	ruby_fakegem_binwrapper rake
+
+	if use doc; then
+		pushd html
+		dodoc -r *
+		popd
+	fi
+
+	doman doc/rake.1
+
+	newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 1d197d11d391..4679323ffc24 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index dc0be1f553c8..7db8eb898443 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -2,7 +2,6 @@ DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST cbindgen-0.15.0.crate 181832 BLAKE2B 01ba21eb1c5bcd4e562ee2d43c839941a69fcc45d17b31800c54016d815c2fcd998176b96108d73b0146a62924315eec373c3749823a5219942e68cb483f888a SHA512 cb0868ccdd5ae8f46b3c07f7f06bfad0583f2eda5381e4404a679814dcaad62ce95c9c16c22f00dedfaa2b78f25f1e5f3404a3e515ab50cffac05d1e6f936e60
 DIST cbindgen-0.16.0.crate 178160 BLAKE2B 45e6d3054582069abeeb6ac9cd54bfc25392eff48b84ae6d5f05f1a7d416caaa0194889c6ff0aa3090fe6eb844087f5ddc3a7be292d341f86c221d86d646e662 SHA512 aca6a783f4347bb977d115b5a1ae8c532b0cad1509a6ec0ddccb4d5f043c59de1242b4f1f4ab081b7ec04f67b5f137b614ab71374377efeb7b119043b47e089d
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
@@ -49,6 +48,5 @@ DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD cbindgen-0.15.0.ebuild 1078 BLAKE2B 030a83c667ad7f0c5c31cbf4464ed3890b677d589b9b0467b45bcff7a65ba3cc1337b7052525ce971c1b4d075a298ac15c3d487e76bf542e4e72e197e6538a03 SHA512 6db7fe82e89d6349359f1bafb50f5e4dd8c80c891abbe3b0ed3380bee89918c072d796060f26a941f698f348a5fb2941e5f6189efa0ddbea2299c3af4b86395e
-EBUILD cbindgen-0.16.0.ebuild 1262 BLAKE2B edaf376e06bd6d4a8c737d44a0ff6f49a9eddc80a5600f6969769ede6a0c915c3a9970fb6877223476e4b801cb537463bd229a4d54c0f4e84da179a7254ea998 SHA512 1aa70da53fe32783011d7054044fce79dcb6ff4e564f681644487ffe45cebcd78c6d1211e39ddc82b9588764435d5e0a8f85ae96f51cd270f8d528cd740bf20e
+EBUILD cbindgen-0.16.0.ebuild 1259 BLAKE2B c1240ac649ca4c9bcf2c959c6b2a05bd5557e8acd93182a0decfadc44e3cc359e8753e02038bfd15e03dc9586e1a7ffd4a17b479213c4af629d69f0d25ddb900 SHA512 8b057dd1a1726033c7b2d9be0be536a662f5624be02c30aff7430206c3785466e08ce390bcd3a195d8a397302c70888660782f7a020b74424386f274e27136f8
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.15.0.ebuild b/dev-util/cbindgen/cbindgen-0.15.0.ebuild
deleted file mode 100644
index c2d3d1844a1a..000000000000
--- a/dev-util/cbindgen/cbindgen-0.15.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2017-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CRATES="
-ansi_term-0.11.0
-atty-0.2.14
-autocfg-1.0.1
-bitflags-1.2.1
-cbindgen-0.15.0
-cfg-if-0.1.10
-clap-2.33.3
-getrandom-0.1.15
-hashbrown-0.9.1
-heck-0.3.1
-hermit-abi-0.1.16
-indexmap-1.6.0
-itoa-0.4.6
-libc-0.2.77
-log-0.4.11
-ppv-lite86-0.2.9
-proc-macro2-1.0.21
-quote-1.0.7
-rand-0.7.3
-rand_chacha-0.2.2
-rand_core-0.5.1
-rand_hc-0.2.0
-redox_syscall-0.1.57
-remove_dir_all-0.5.3
-ryu-1.0.5
-serde-1.0.116
-serde_derive-1.0.116
-serde_json-1.0.57
-strsim-0.8.0
-syn-1.0.41
-tempfile-3.1.0
-textwrap-0.11.0
-toml-0.5.6
-unicode-segmentation-1.6.0
-unicode-width-0.1.8
-unicode-xid-0.2.1
-vec_map-0.8.2
-wasi-0.9.0+wasi-snapshot-preview1
-winapi-0.3.9
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="A tool for generating C bindings to Rust code"
-HOMEPAGE="https://github.com/eqrion/cbindgen/"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-LICENSE="MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-QA_FLAGS_IGNORED="usr/bin/cbindgen"
diff --git a/dev-util/cbindgen/cbindgen-0.16.0.ebuild b/dev-util/cbindgen/cbindgen-0.16.0.ebuild
index f89f82967825..070536dda748 100644
--- a/dev-util/cbindgen/cbindgen-0.16.0.ebuild
+++ b/dev-util/cbindgen/cbindgen-0.16.0.ebuild
@@ -63,6 +63,6 @@ HOMEPAGE="https://github.com/eqrion/cbindgen/"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 LICENSE="MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 RESTRICT="test"
 QA_FLAGS_IGNORED="usr/bin/cbindgen"
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 7d7029483c7f..81b4fab50d34 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -23,7 +23,7 @@ DIST cmake-3.19.3.tar.gz 9265831 BLAKE2B 133ca8b12c0ccff0f9d833543c66cac597d7289
 DIST cmake-3.19.4.tar.gz 9266976 BLAKE2B b5ac44fa426a47031e37fca990130d9289909a5f21eed2ebb0987da9202db16f654a1f3eeaca2465693b2fca09de05b9bb452dd71df9a65ffd27c02da577a1c5 SHA512 e2781479d2185f8f927439b795120a0f4957e9da7730804ff8ec06d6bbe75a0069e49d95e642706179520a7229ae82e53bab891fa8cfd859913c0cb5fd4e843f
 EBUILD cmake-3.13.5.ebuild 6239 BLAKE2B 5e3b289af5d341e73fbdfe6162330e9e39dac40276991f08df670fcff6e40438995b608704e535545c4538cedb7ed789c2cc2ae0b38a1fd0f3a2e9627c95a494 SHA512 e75ea6defa00993410ed865329b450f38f9ad418c59bfe345880bae25d2f19e4463a407d744527d3f5c6c59fe8cf732cad5ac6274901cfcf3809d29573be7ad1
 EBUILD cmake-3.17.4-r1.ebuild 6124 BLAKE2B e5e3ae707d53e486d2fc594a3376138067b1e2e0041e04354e1ac3a1f7ae40f2d87b4eb404e457967a3cb62ba437b0b9dcd916cce50e8d6d30c0c0da3ecece28 SHA512 145b100bd219c50de18d94066c5d73cc77051b054ea5822e0fcb86f53c3d381a29e0026c25e115320df3c324a96519ffa670ecf73e8dc24527043dafb51fe443
-EBUILD cmake-3.18.5.ebuild 6078 BLAKE2B 01cb28e819e3494817ee7cb0f3faa663d7cb2a2a4d8d575e1211e41b4d35bdc1ea9a1ce21fa3ea650f8d69a290ffdad83fd462b305a3a3da19de62aa3180042d SHA512 39c8ea042d9358546100659b25fb7e223afbbf66d404a9b11dd399470f69c5d96ddeb36d160d1be14c1a4b9227c71ae6d79c09f5344abfa4519c2643ab24e1ec
+EBUILD cmake-3.18.5.ebuild 6077 BLAKE2B 09bb5432f455b53cf232dd57a11a5ea755af02860923ba4a4b9b9b2a86824b71b72fdd89b86ac2afc02b414aad1a0f4460b17185942db0f4591f23a394ebba8c SHA512 e4f51821a1b966ccc716115bbf8a5ee325272cf03f4011a2b04e2e5f882fa3804b6af0776bd2922cfe48946501de1de1dfbe00b7f17c6543902bdbe6223a42f7
 EBUILD cmake-3.19.3.ebuild 6846 BLAKE2B 563f68ac5e2ef974604ae3c130b6e049f180340d54e48fef71b779bbb85cf132741f50fc6b09cadca29d6f533a40ab26da88eb99dfc98fe5fa637eaf7c42e565 SHA512 7a7177869712e7e9f1217b5992d50e2cc0d560cc3ce97ac9e5f95469bce5a6b883baca033b9a2c9e859abdf978a6ea3ee66e69cafcc1b3b609de955249a0147c
 EBUILD cmake-3.19.4.ebuild 6846 BLAKE2B 563f68ac5e2ef974604ae3c130b6e049f180340d54e48fef71b779bbb85cf132741f50fc6b09cadca29d6f533a40ab26da88eb99dfc98fe5fa637eaf7c42e565 SHA512 7a7177869712e7e9f1217b5992d50e2cc0d560cc3ce97ac9e5f95469bce5a6b883baca033b9a2c9e859abdf978a6ea3ee66e69cafcc1b3b609de955249a0147c
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.18.5.ebuild b/dev-util/cmake/cmake-3.18.5.ebuild
index 4cd2e415b0d0..a8a036ebaeec 100644
--- a/dev-util/cmake/cmake-3.18.5.ebuild
+++ b/dev-util/cmake/cmake-3.18.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="doc emacs ncurses qt5 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index ae0417fece6a..c77622a57798 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -3,6 +3,6 @@ DIST lttng-ust-2.11.0.tar.bz2 824285 BLAKE2B 161d50282a95cce47ab3811216241ade73e
 DIST lttng-ust-2.12.0.tar.bz2 853127 BLAKE2B 6a6655a4aa33ec6318255d05d0e000c19fb66d4049873f091b8e19f3f9ea0c15731db70af77dbab1d597edcafcd745f1dae2670cd38759c9b54ea38b1135b590 SHA512 d69772170f57b9669b99cea372ca537777151a31b82002e1e5ec80da3ceb302c23f0f85d63a2c95c90a375b879e266aa5297e7d6444050dd40feb1253d863801
 DIST lttng-ust-2.8.1.tar.bz2 743271 BLAKE2B d6adac00525ab747306288dd71f27ce982dd93e4ff42b9938064ae1435ad1c0867acebe3030a33748dc9aa78b6200ba2c47631e4359a963772fc4685472d21ae SHA512 15c459620cb73ef5be8c7df2ef02663ef650555b973a3d1ed976ae38068b53a8c83143a611bcb53e91a3f211361c44cd2a331cb41dd53d28a69924f7ac44cc95
 EBUILD lttng-ust-2.11.0.ebuild 773 BLAKE2B 8ab82f84b6e9a444e8e24f02d3c3ff51f9dc187f8e327f709f86126e4b770987ac45f29f0bf2a24e8c56affb1f7834769bf78800424d715b1ebbb8a661911541 SHA512 cf354f8e33cb778b58b8afdbd64720eea0a13afe4362641fa59057531f31f9279b927b4359b1f8da6f466eba0d7f31ccd5eec043eab6300e369e5686ee056233
-EBUILD lttng-ust-2.12.0.ebuild 789 BLAKE2B 2e4320195999f877fe60e005057ecdbbbb053378588967204c34ee290ae3ed4f30de3d6354027b8f29827f1632320663df3613fe86d2e6d4f9ff084c13e7c700 SHA512 abe862b52817d3e921731296ec1377292ac66ba883b17c990c90692facd8e525d7804e861f96e9e6a7ef738af342ee92dde89dcf4db5ca824928df148855405d
+EBUILD lttng-ust-2.12.0.ebuild 788 BLAKE2B 9b2eb907974ae73450f271e25ba5c133ba11cc0e5a517e5b106bc75a37ac4f334594301d1ecfe3327268bb4654403e75352f80d8bd1020bc70d911bac3cd2669 SHA512 d954112dc17d7a7424dad4cc1de705dfe9ba365b8d4786ddb5705d168b3f5b895e42204a7141ffde948e15e2dd3c521b3be5375c6ce04b21080d370b71ce338b
 EBUILD lttng-ust-2.8.1.ebuild 661 BLAKE2B e08924d8e984f5fcaf64e18254c3cb84e1595299c6657081250bcc7671568d61be48289f80200697a8e9a8bc592edacb71f45c5d490edeeb962d0a1deab64ab3 SHA512 ca86ec9950371c87faa5f84d16a3ad9778c80cbd2b896657f6f4481e6e2623d5ddc53bd15b3c5837f7a5320bcf41d3a96a5dbdf231d1dcd8e07bfdc5f7e080d8
 MISC metadata.xml 700 BLAKE2B 868502f60e5fe09cbd2a2abd0794920341ccb496eaf2b1bbeaf377c0d894b35e950f79636e334ec910dd3ea0e3f2a205eb849b3bb2eaf17c1b7851e630a186fe SHA512 dda0af06ba5f4c5cf8b01aa61989c910acb58ff96b0e50f23f43f8d1932194a954bd3e1ae38ef052e4ad4d32dd025a082fea1de739ca1d9e4a2f60bf8ecbcae4
diff --git a/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild b/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
index 1fa1ef7f3a36..ba8711568dae 100644
--- a/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
 IUSE="examples numa"
 
 DEPEND="
diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest
index 3605dc6abf9d..872ecd6874f9 100644
--- a/dev-util/rr/Manifest
+++ b/dev-util/rr/Manifest
@@ -1,3 +1,3 @@
 DIST mozilla-rr-5.4.0.tar.gz 1434820 BLAKE2B 8454304fa2ddf85fcd385d3d4e72b8963dc0f6804bf572db31654cdf5bfc8a3afd050380fe34d280264114467e9b973866384d75d6f8b7078affd51064e9f597 SHA512 69b029a29cf3c147f033ff4c1c67c6190f5163b4f7329306e5f0ccfe78cae4b6ae262602253772e83d5a55408c5a4d121e5a9b3530779de74adc34b81e2592c8
 EBUILD rr-5.4.0.ebuild 1348 BLAKE2B f67c328eb6070da7f39a582be3b5e9aebab505ca8c59a2085649ecdfd1fb1cc7b9ec3d8cd9d4bc5d1345519aabbedf4dcf2b102165d77a98d96d07d585323b5c SHA512 04da5ee7ceb085c9aed2beac5a770eadb2b807f30e8ccec31bfec262185681f98982fa04845afdf2176433a5b549c511072beeabca210e8b6a69b2ed7574824d
-MISC metadata.xml 555 BLAKE2B 3618975613ac5286f849880de14d61b1cb74b0e64d539250c700ff0c955667acbcc11125381c31ba39b839da4b38c5d648fea27ebea4f7f28ca492e0554e3a27 SHA512 33487b0389d097115365ef82c85accedf17d798e312e9528fae27519f242c343fa280d32bff05c6f1a1620d6481df1db57fc4c1e2fa7ce36dbe56f998f03870a
+MISC metadata.xml 443 BLAKE2B d70c790352f2bb15eba6c51faf34dafd53ee72d263608e3a449e0af2ba552bfebb98688de88c48bd087cbe884be5d330152a760e0922be35623a16216ffa3076 SHA512 2470f85fee8847c9346e37eefb7c3dc384e38e9fdfee47a70a88b5737669a1321910cfe7fa1b381818515165ec9aa94ada2ec331cca312a9b9be73531979eb2a
diff --git a/dev-util/rr/metadata.xml b/dev-util/rr/metadata.xml
index 4c3360d06373..642ca0c4ef15 100644
--- a/dev-util/rr/metadata.xml
+++ b/dev-util/rr/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -9,10 +9,6 @@
 		<email>lu_zero@gentoo.org</email>
 		<name>Luca Barbato</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>mudler@gentoo.org</email>
-		<name>Ettore Di Giacinto</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">mozilla/rr</remote-id>
 	</upstream>
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 2077ef672d94..acf084040cfb 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest
index b448aa908a1d..2a98335737d3 100644
--- a/dev-vcs/git-lfs/Manifest
+++ b/dev-vcs/git-lfs/Manifest
@@ -3,4 +3,4 @@ DIST git-lfs-2.13.1.tar.gz 2526962 BLAKE2B 3f3af1c0f976a17c108159fff15a065600f32
 EBUILD git-lfs-2.11.0.ebuild 1392 BLAKE2B d6e33aa99c265dd3e2fd889c5bd9a70b751e15cc9757343e1e1bd7bec432e8015611e7b3009d1cd291eaa6b69e0a6fb7581d50f744f1a164d52936095ee5c03d SHA512 497ae5f9fa85cc412cb1708f13e75acaafc4087c5243aee8bdc9ff4567756cd60602cda6092ea1f98fe560a7ae9a6a05f69ffbb862136d2782b2850d8512ad15
 EBUILD git-lfs-2.13.1.ebuild 1574 BLAKE2B a4115ded4f732b9a9e4d2c16ce0ccb75ee553ff311433aaa56e9a4f799b6a69db0360526dbb1b610805063b756a4de3f717db6a7b0025da41033684dc13aca72 SHA512 7ccef2d1bedb5bff04bc8cb73d3f8c797790173278d6bcccacb82e2072b6203859114d7525990dbb897a30281c44642ef626d321e1d28a893806a5adc7a97e69
 EBUILD git-lfs-9999.ebuild 1574 BLAKE2B a4115ded4f732b9a9e4d2c16ce0ccb75ee553ff311433aaa56e9a4f799b6a69db0360526dbb1b610805063b756a4de3f717db6a7b0025da41033684dc13aca72 SHA512 7ccef2d1bedb5bff04bc8cb73d3f8c797790173278d6bcccacb82e2072b6203859114d7525990dbb897a30281c44642ef626d321e1d28a893806a5adc7a97e69
-MISC metadata.xml 558 BLAKE2B 307387b4326dd3982b949f3dc06f69efa31fcd70cbb03b1c68a5557965fdc14bb32f638a644c951ec06bf979baf8046228bf0820c9dac96a3d984c3cec3b32eb SHA512 8ae42faa56a37e9ebbd3c6fba90e4e87b44f8022ffb2bc3fb2eb7128c5bf7c34497c7a13c73252db5b5096135ed153a61c74382a54870c32c36eba7af23f7cbe
+MISC metadata.xml 446 BLAKE2B f6678414b5292ac89330446f6e140a70f998e9932dc0852a0de0bdcfd6406fa9bbc0aa479973ef0cebedf6bfa6a041bf9c3deb94df0e58c2bf57655b0d5f30aa SHA512 f63de45e71c0b09ef762289665523c39f5d89687b1d92e8ef632e8fa74af3a2150ef29a05e30846a8378f100360ddd275f4a0f63f57c480abf21adfa60b81d81
diff --git a/dev-vcs/git-lfs/metadata.xml b/dev-vcs/git-lfs/metadata.xml
index 427f1c497f19..0b79785e6d58 100644
--- a/dev-vcs/git-lfs/metadata.xml
+++ b/dev-vcs/git-lfs/metadata.xml
@@ -1,10 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mudler@gentoo.org</email>
-		<name>Ettore Di Giacinto</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>holgersson@posteo.de</email>
 		<name>Nils Freydank</name>
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 2d08d3332aef..9fd0bdaee6ce 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/display-manager-init/Manifest b/gui-libs/display-manager-init/Manifest
index eb6d07cb78a3..e9264c309415 100644
--- a/gui-libs/display-manager-init/Manifest
+++ b/gui-libs/display-manager-init/Manifest
@@ -3,5 +3,5 @@ AUX display-manager.confd 608 BLAKE2B 814b4d36ce74d2f70a771cda31c3b9f6e21246bef6
 AUX display-manager.initd 6145 BLAKE2B fb1debd71978b157c185d9a7065c7f630a0d64839652b3882e6f69823444694f4a7fb347a49dcff35c11a9df94b5e8dcc85eac8351ce9a9992c23a13e67eb669 SHA512 5ea8c89d29c03ebf814a5bd036387bf9d8e65962f402b6ea2ce26e3c99f2972fc971b3b6e5e6971a3f1dc559a6d0ddf8b7f5b7f2170bafacfa79653cf3c5445d
 AUX startDM 786 BLAKE2B c5026e862508e598a0b3e8940a5dffd697fecc109eef343ea0f91d72b1b6df927dd273a1e69cddbae7324b707c9cc7b2f2699c44d106100f2b32db28c331f331 SHA512 a35ef86109624f5adb4275906f8466ef8e7a62af93bf2038b5f44e713b446264f1ecb00ff8bb7bb498a89bdbf3b96e50ebf5a7a39471c3c4395506c92f907dcd
 AUX xdm.initd 200 BLAKE2B ec997b7080037a7197a6f75728d9075c846168115d705015afc6518e1e72d815cdf87c2e9e3f3ad950034599e548d015e530cb7821f83b9d289337908455c17a SHA512 4552215cc2cdffa3298a9136e2a22f600f55958d7f74b2d06bbf48568d8034ef24deea27ad9f8d6d100516b0efb4e2688c1f454dc556120f759b1da7fecd877c
-EBUILD display-manager-init-1.0.ebuild 1577 BLAKE2B 834ed10a87d32f74fd042ea8b6a4d9d478d2272ee8289b4b93ef95121fee917460e73aae4ea0cf74f7e6153fd793aaa11b4bcc9a5ee397c08a539b364d2a38d5 SHA512 cfb3757cea9806c95596240614cd28ba6b2d56c0b42565e96ffec509dc060a0bca3bfe5c5560628c77028e9b33dcf5a685c9b3946c93a048beacee3e53ee52a2
+EBUILD display-manager-init-1.0.ebuild 1579 BLAKE2B 2ffa7aba353f42392aafd1be9fe81691bbd0d0757ec371c2f7313e9245a1c0963981b4817829e2166ff21b5df81feb2ed3264368f35104233b8e27a393c22d6c SHA512 eaa98a49f4759580608e3185e5730725a9212ef949efa37471b7f3b51b7df44fae5a986ae7fb27e2578f6f3cc1908fd0ec7c9e045ee39481a3197939d01752bf
 MISC metadata.xml 258 BLAKE2B 4597deb2f1355078e78791baad22d30ec067357a50f01a817b3fdd239e794a4255ac4e59908b7d9d2e276e455fd352320ab46f37dbfd7df036f64c0bf3cc4900 SHA512 d97af5111022f569340bb378949f4f70ab33607c1d5dc027eff7d64a7a2ed64238710f8bfb623e01e01d48c7b1db60318ac340b8a4279d7fa6984f35a083b2a8
diff --git a/gui-libs/display-manager-init/display-manager-init-1.0.ebuild b/gui-libs/display-manager-init/display-manager-init-1.0.ebuild
index e78fa567607f..8b5a2670683e 100644
--- a/gui-libs/display-manager-init/display-manager-init-1.0.ebuild
+++ b/gui-libs/display-manager-init/display-manager-init-1.0.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="RC init files for starting display and login managers"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:X11"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 S="${FILESDIR}"
@@ -32,7 +32,7 @@ src_install() {
 
 pkg_preinst() {
 	if [[ ${REPLACING_VERSIONS} == "" && -f "${EROOT}"/etc/conf.d/xdm && ! -f "${EROOT}"/etc/conf.d/display-manager ]]; then
-		mv "${EROOT}"/etc/conf.d/{xdm,display-manager} || die
+		cp -a "${EROOT}"/etc/conf.d/{xdm,display-manager} || die
 	fi
 	local rlevel using_xdm
 	using_xdm=no
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index f7362bc2f858..2850bc078b5a 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/kdav/Manifest b/kde-frameworks/kdav/Manifest
index 3b5e482df896..36c13d266776 100644
--- a/kde-frameworks/kdav/Manifest
+++ b/kde-frameworks/kdav/Manifest
@@ -1,5 +1,5 @@
 DIST kdav-5.77.0.tar.xz 59300 BLAKE2B ad1e9baa8423d5ded0fe975b5cbe2b906ea49a7766b34f89049d1253c14ce6001ac270454d2fba539e443a4ecb0ad78497438898f57019b54ea28164a22bae5e SHA512 18f13f38c5b78be4258062ab38b6b626bc19ba6a9ff5f0b983d5d9f5e000932346362e8f9f8a6af8544ea4037b99f24640998a5978269415b63a406b82c48e24
 DIST kdav-5.78.0.tar.xz 59240 BLAKE2B a7a85b82fc7dc3b1f612e6e01a9ad0077929e4346918a2590b71bb625794c356455290dc4e8f65732b86e3ad95da6d4c8e14228f880742cea5734b7e9b93f06b SHA512 372af4e28f7fb8f105d290554f5d948d987d60ba2114095b4dd23548507d5bb3cb7c51a7a8468a67e5d6668b2f0c21516b7d24953aac17fec6dcf0b0e7c71ddb
-EBUILD kdav-5.77.0-r1.ebuild 793 BLAKE2B 99cb57fa52fc50c47cc02011fc217af3455d46f29a2fc2aa34bc448ff9f354851e1ec6237c57bd8adb51026ba16f3c107705bd82d103de08c83c68169898edb5 SHA512 b25f498788d60aaa388bf897e264693c9fce889242f77c2c68cce88c39ea2205f7fc96a4617e3fe0c74246f25b246f1ed95dcc6b66ae901d4514d1e9c43f5cbc
+EBUILD kdav-5.77.0-r1.ebuild 902 BLAKE2B b89dc0dd041bae39cc30c04a5f3fca277527a8e79f7a6634f9027bfc3338165d476f0ed38aac42984d656ac8ff8d48de05f392aaa1c02b88bf58ab13bc45da4e SHA512 bc2477633858bea7c154580aca9807d3a6e859e1aa13fde9214e416c9cc41534492e58caf52917efe7227f5c994e6a7bdf4bcf5022059b5c625b72e945233c09
 EBUILD kdav-5.78.0.ebuild 796 BLAKE2B b8de85c371dd971c247156115aa28f0561f86e847b6d571ea4ba48f65aa4af30f133dd3e23f75d990e158e104866d3d4f5d42dfb8ecc8feb936f1f43f1eeaf88 SHA512 ab9139aa829075b04df04df46adec219d94088f9d884470c39049a5f0dd83d8628bf2872a78b9f53165afefcef21f8dda38d69dc86dfd35c0bdd5961ec811831
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdav/kdav-5.77.0-r1.ebuild b/kde-frameworks/kdav/kdav-5.77.0-r1.ebuild
index 8e2543094fe6..7b0e185367b4 100644
--- a/kde-frameworks/kdav/kdav-5.77.0-r1.ebuild
+++ b/kde-frameworks/kdav/kdav-5.77.0-r1.ebuild
@@ -30,8 +30,9 @@ RDEPEND="${DEPEND}
 src_test() {
 	# bug 616808 - DavItemFetchJobTest requires D-Bus
 	# bug 653602 - DavItemsListJobTest mimetypes unsupported
+	# bug 765061 - kdav-davcollectionsmultifetchjobtest ## fixed in 5.78.0
 	local myctestargs=(
-		-E "(kdav-davitemfetchjob|kdav-davitemslistjob)"
+		-E "(kdav-davitemfetchjob|kdav-davitemslistjob|kdav-davcollectionsmultifetchjobtest)"
 	)
 	ecm_src_test
 }
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b4c679f20e00..f536cdb50ee2 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 39a93554e5c7..717439e00b2f 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -7,5 +7,5 @@ AUX alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch
 DIST alembic-1.7.12.tar.gz 827983 BLAKE2B 7d508fdbfd92f213936635666a221fdad30f242a37ef8ff54a6272854565ebb890ffd11d8fe010f1558c0872fcb23080413d76380772ebf5db52033bdf0d9c85 SHA512 e05e0b24056c17f01784ced1f9606a269974de195f1aca8a6fce2123314e7ee609f70df77ac7fe18dc7f0c04fb883d38cc7de9b963caacf9586aaa24d4ac6210
 DIST alembic-1.7.16.tar.gz 855709 BLAKE2B 8009ed199b7dca190e40f56969d7c446e65bd78f58cee75dda4883ecf02b6c7ee422db76c4f523a76a4b2d42ef1547ededf5de0055cdb5d801c5cd4918a0b5f4 SHA512 bd4777dc4abf15bfb8307b00fd2d67671e89944d0dd8a74a657f4aee49e6a1cd0ab1fe5bb7f9afc63abcce2123466bb8a9a3886d41724ed2c242bc61d7d5b3a1
 EBUILD alembic-1.7.12.ebuild 2398 BLAKE2B 304acd044f9cc247f99df23810934a2917df21bdc7e7885a52857c458e6419f502460a35f1bebe947bbc4513c47dd1e09dfc4d447fa278ae0fcfd568ae683b98 SHA512 2c31a9759a2725576b0c22745db5cb59b376b5cf5bbe4d72df641666304533d8005d9417702073bbe0570772e56b06687571d45876840eeb899b9f52866458f0
-EBUILD alembic-1.7.16.ebuild 1241 BLAKE2B f4f0a1ea27ae8e8539c0e4c14e399d9d2e546053367a80d7bb6074295257cb701b2affcc01bc614ca516bfe11417f5fd37d3a5ad897eb647fe4645fed91f6440 SHA512 5715deaf8e193709500879591572d4c73734c7ad1c161fe344ce68f3c2d868ab1ebcdf2c50c7f93b2f4c253a7d4e6eabfbc6d213eb86101fdba2225807841ccc
+EBUILD alembic-1.7.16.ebuild 1240 BLAKE2B 5179e8f1e56d2bc788684e50adf4d8229246cd9a30684a841f913c69ab966edf6a5a8603678c8aa6492101e4c4a548b7178937fbd12224ca0fdbd54756ad740a SHA512 c6778b410482a1b3c789d5ab4f55b240c0f3c07d42da568488ba341f3564e37549616c05f6ce49aef8b9cf6f377ba6b884c84e33c4652adb929c3787f05c863e
 MISC metadata.xml 1061 BLAKE2B 5b15f06e392250e29645c008123cd23313b91162a4d42f769981249ec31250f5169332916eedb2bd0cbe9388be92adf151b9db8a11aedaaa4afbf9f33551481e SHA512 eb435c88829cdd15a3c993528e291d415c05f56d0b82d95b7b89e389f1dbb62ce50e822a180676f4c9191af4ba72a74a8935619af5ff96828117f72cc10b262a
diff --git a/media-gfx/alembic/alembic-1.7.16.ebuild b/media-gfx/alembic/alembic-1.7.16.ebuild
index e7b7b255e52c..1fde48d28344 100644
--- a/media-gfx/alembic/alembic-1.7.16.ebuild
+++ b/media-gfx/alembic/alembic-1.7.16.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 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="hdf5 test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/frogr/Manifest b/media-gfx/frogr/Manifest
index 9eaaf3ee4eaf..125f349b1ccd 100644
--- a/media-gfx/frogr/Manifest
+++ b/media-gfx/frogr/Manifest
@@ -2,4 +2,4 @@ DIST frogr-1.3.tar.xz 2552456 BLAKE2B 562f88898fec153c50696dce59b5396b6f9e88bc68
 DIST frogr-1.5.tar.xz 2233600 BLAKE2B aeb04db0d5d57f470d377986f2e857ee63b47df85e9c3251cdfac8585efa19491650ecede0bfa95c157c2584298dc02173afec624bc439dcd8b52d101c465d54 SHA512 f4af5ec82ad1771e71387c40467fc697c7e3edff9f76ecd0f762e446d136a293477867cb7b6bc6d10bc0fdd95210b25f515eb56bf2d456f79009884019c44dd4
 EBUILD frogr-1.3.ebuild 626 BLAKE2B 9e17e2f7206f357020256d796ffc92b2f3bb63d3b5f8b52209289628d8ee76cf6ac18e84d5982ddd4828437275f2cefd039025d9104ce0d0f3ab958b9bf2cb96 SHA512 8b2eaa44c95a0266e1568becdc8fccca0dec6de3e31d9cd71a228fa068a361ea223efdc39b318459abb68c285efb9ef688cf5b44eed79f1d79e4db76b6d7427d
 EBUILD frogr-1.5.ebuild 891 BLAKE2B 444fd6ab77b7bd9015785d6c4eeefcfef3990d83b314f11119e91621e84646d633664bc2527150052252b40b39edfddf1213f051c3ff90d3942cbc689881aff4 SHA512 22e34ccd09564056a188cf2486b1c47edad79e231f27f909b2b38184a0067df1f9762eec4b35d65e15096d37bb67b6eaaa3fe48640f6b783a8cf9aec2a83948f
-MISC metadata.xml 471 BLAKE2B 98553d988349910ccfe0ef4130d85d7cfa800907b6ab4f7823368fccfbfdb2cf5ecc05bb1b567e7749f92e240f2e2ec8bd95cb3ced30e9d0f3c011f3e8ad4664 SHA512 4c254ca88582b48b89673a930d4bc1e4d051b828c4241a8fd30c28375099fb78b8691ea65c90ddd3b60305ec68d3db9986959ac899b8f2341f562c6d435442e1
+MISC metadata.xml 386 BLAKE2B 5b6c13b6c0a981e0e1fd0c7092204999a4849c2339bb35de15b69bd04e736f8f5d1ea905f429f036852e34a7c729e744518f0171ef29c6cf016fc047332b2838 SHA512 660c88d236b1c2ba2ea1e20d0d2ea9a3acc5a9f8d0306b3ed98bfec2d616e67b9e8aceb137438e6b0a6517588252a676c715f6177b9e369d09019064254c8f53
diff --git a/media-gfx/frogr/metadata.xml b/media-gfx/frogr/metadata.xml
index a75837990a74..56b1b12cb47e 100644
--- a/media-gfx/frogr/metadata.xml
+++ b/media-gfx/frogr/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>sobhan@gentoo.org</email>
-		<name>Sobhan Mohammadpour</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Frogr is a small application for the GNOME desktop that allows users to
 		manage their accounts in the Flickr image hosting website. It supports all
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 7316330e6d30..18f8657da009 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,12 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.11-58.tar.xz 9167216 BLAKE2B 48fa4d6ced002a08268bb607bcf5988bb9fdb27c6c5fc20e5c73c06b9e48837c972b884e73d8a57d16dc0a1d9ba0cb4cf6aaee144a7193caa3d9fbd5ec6839a8 SHA512 b116596bb737cf78b9ec27ae4cc8aa3163f4201e68c3bbc9666421766859d2a2d7521697a4fdd94c6276d190667161816d0ee31dde3e06303bf09ffe79409885
 DIST ImageMagick-6.9.11-60.tar.xz 9167220 BLAKE2B e212c2435414ef052de478c3c65c25291dac2f7b8d213b4408a1971d9c3b57180269a430b6f9fbe9da45587dc52fe62cd9b520f2b2a8e5b03fd86260107c2d0c SHA512 5a4de32a76cca71ae1ccbdc67f160aa451fbf44cf77fb7476ba3a2a6116783034a334f9dec7b8fbb328f06a2a4bec2423f72e4a6b452436b6953bec83a49a8b5
-DIST ImageMagick-7.0.10-58.tar.xz 9655792 BLAKE2B b16db99046427bc0c764588fbf7d10f9f7cdf665d8662b03103ec69c75d44aea80575ae1b8381b15e33dc6a393216918cecbdbd93ea61639b4b09ec15d1588c8 SHA512 ec58eba8a35d78e481d98ae6e13daddc81a8e28904b1524735ce54a7d1557b4ec22d314ecdfcb199685ba55604e6fcdc3cbf9193775627dbd42bf61983c98593
+DIST ImageMagick-6.9.11-61.tar.xz 9171260 BLAKE2B 89047378e414a7455baa28d413f49dfce3eb54e462211ba5e61f786111c569b26166217ca7e9f5e12c0602bde64c8e9726a67ee3c6be4366d692c2b6232dbbbf SHA512 742fb0b3ff4da98ff05a7fd48b1c5db038bf276975575c4e549f30d61001384c6b508cff526f621467d38a29a9cf015f0cc8c42801720f1b47d6737afb4bac78
 DIST ImageMagick-7.0.10-60.tar.xz 10143800 BLAKE2B 665cb5517cf9864ffd7e132bdeb01df02fbc5211b73be568751ef3cdd2638a9052862a6607e0b5236cd44df3a796e107f4f0ec5d088b032d6829342f937d56b1 SHA512 bfc3192ad465511ed8b88947cf4b8f306202b6ed3ec230ac524a13a17a5adcab44788d79b659d071df82d4da7833d1e9bca0481c83de51dfdfb9cc16b97537d6
-EBUILD imagemagick-6.9.11.58.ebuild 7058 BLAKE2B 9c8142d44c502984ab0c4f27d4f2013997fae642170a03516b2cb0443c79486dd70f603d66080f7cfb6c5c79add8acaa8e5e6c3002dd02994f57c9b7909bcf88 SHA512 f7933e87df9ba40eca3b71a3fdb78effb79293062cb1e7ac821b7ce3a90309623efaad40048daf2d5f13be26d186aa78c00b3bd54db80b20a394b040edea5dcd
-EBUILD imagemagick-6.9.11.60.ebuild 7065 BLAKE2B 0b37c67158ae3b4bce0fc69f2d891f6de22d5546aaed84666465cb34f2faf00af94c33dc2576e3680a7244cbd96f909e05785e22131121f6037d139db3f3395a SHA512 1c3993e04b1189cd20781f01b651a28e64360a2db7bdaa654ea54b6fdd4fa9371014f2e3312bc5d5138e0e192b20223120912bcd6acb67352ff5f498cd63dce6
-EBUILD imagemagick-7.0.10.58.ebuild 7367 BLAKE2B f35bd66be7bbbe541c44f790a02c4afbfa7f74da18c4c938eb8741fd4536f10fa93bb18243c1b8ebecfb520254657ff824e3e7ca8f07e69dfb2d6f90f665fa94 SHA512 46423ee52a846340dc791a1faea012883a8d58b9858874fb12d4fea4a26890195b3b0848035e88fa7e482dfa694fe799914de8322fd6cbeae226c8be9d1130df
-EBUILD imagemagick-7.0.10.60.ebuild 7375 BLAKE2B 3b5c65437c1e0cec41a5b001a03941962c2fba2e8e78ba013b03fc6b75bb7f5773f734ca493287d26e31feee50d299d787b7f2bb1d53911a77214c1217a3a394 SHA512 d02334f79bff26688d48be19d66293201ecdc833e306efeb6d39e8f7299ace14d5e320db0c075abf0a8fd19ae59c82129b1322544df0055a28b661bbe426a2df
-EBUILD imagemagick-9999.ebuild 7375 BLAKE2B 3b5c65437c1e0cec41a5b001a03941962c2fba2e8e78ba013b03fc6b75bb7f5773f734ca493287d26e31feee50d299d787b7f2bb1d53911a77214c1217a3a394 SHA512 d02334f79bff26688d48be19d66293201ecdc833e306efeb6d39e8f7299ace14d5e320db0c075abf0a8fd19ae59c82129b1322544df0055a28b661bbe426a2df
+DIST ImageMagick-7.0.10-61.tar.xz 10143308 BLAKE2B bc343b72567d326f30825637366e5d5614e8d53e5222fce357acf0acc9aceae84fe99d67bc7ff2d593e754b990d1e8449785a04724437b61a35e9282f9af799b SHA512 f90d8847fed7f1a5ca3fa247eb1ea115d6afe6fe379fb48733c539456663ca89426336f7ef8be087c1caa0eeafc7d63285f3c35c400fa94b30459796650421c3
+EBUILD imagemagick-6.9.11.60.ebuild 7058 BLAKE2B 9c8142d44c502984ab0c4f27d4f2013997fae642170a03516b2cb0443c79486dd70f603d66080f7cfb6c5c79add8acaa8e5e6c3002dd02994f57c9b7909bcf88 SHA512 f7933e87df9ba40eca3b71a3fdb78effb79293062cb1e7ac821b7ce3a90309623efaad40048daf2d5f13be26d186aa78c00b3bd54db80b20a394b040edea5dcd
+EBUILD imagemagick-6.9.11.61.ebuild 7066 BLAKE2B ada5b5214b94e773059e105bf2fc5b1744db5b274b2efd05758cc3a9b312106f5a1afc1aa338b2f58a913398aae5b5208da958be36f57938cadaa0d68b8c4e91 SHA512 1f4702b1f29258741add620a1b5ef104bb0ba466907717193b23278c840e39b2ed3df054b0072b4c8fa3240583d0a8acc18d7ded28261e39c72332a75ee5666c
+EBUILD imagemagick-7.0.10.60.ebuild 7367 BLAKE2B f35bd66be7bbbe541c44f790a02c4afbfa7f74da18c4c938eb8741fd4536f10fa93bb18243c1b8ebecfb520254657ff824e3e7ca8f07e69dfb2d6f90f665fa94 SHA512 46423ee52a846340dc791a1faea012883a8d58b9858874fb12d4fea4a26890195b3b0848035e88fa7e482dfa694fe799914de8322fd6cbeae226c8be9d1130df
+EBUILD imagemagick-7.0.10.61.ebuild 7376 BLAKE2B 7e8ca320022e06c6a086f1db7feaf0aeb6d08b5b56246e254a481e612e93adff13ea5fda44338bae4c57eb140128b14911c2c47456e26fba4467dcbd7038a355 SHA512 6262bb1875caeb3f6aa40849f1dc8686846ac95c5ed6e476f355bdf1eea30880deea6fc29c861ef959eb788963c091332362f87d19d6b1024b03b5a43652258f
+EBUILD imagemagick-9999.ebuild 7376 BLAKE2B 7e8ca320022e06c6a086f1db7feaf0aeb6d08b5b56246e254a481e612e93adff13ea5fda44338bae4c57eb140128b14911c2c47456e26fba4467dcbd7038a355 SHA512 6262bb1875caeb3f6aa40849f1dc8686846ac95c5ed6e476f355bdf1eea30880deea6fc29c861ef959eb788963c091332362f87d19d6b1024b03b5a43652258f
 MISC metadata.xml 1226 BLAKE2B 09876ac633363817b503a307e2cc0a500cfdcc1256cbb3b3e595600a0c913aa7ad252eb4dbe18b911bfcc9f06ec7b8046e0c2e3882eec305e471080bd76de906 SHA512 da1bb41d877614a237ea14379614a509fb58d58f4e93e56500e6aa0007c0515e6d90731c5df9e387f36632a210276a6983784cede64119453c965a9fc7e2ea4d
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.60.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.60.ebuild
index d80bdfa74e82..8b0ce8fdad51 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.60.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.60.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/6.9.11-37"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.61.ebuild
similarity index 96%
rename from media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild
rename to media-gfx/imagemagick/imagemagick-6.9.11.61.ebuild
index 8b0ce8fdad51..4063f8df0b93 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.61.ebuild
@@ -14,8 +14,8 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/6.9.11-37"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 REQUIRED_USE="corefonts? ( truetype )
 	test? ( corefonts )"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.60.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.60.ebuild
index 67687ea276c1..5d7a1d8dc05b 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.60.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.60.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.61.ebuild
similarity index 96%
rename from media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild
rename to media-gfx/imagemagick/imagemagick-7.0.10.61.ebuild
index 5d7a1d8dc05b..7ac9327f5a45 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.61.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.imagemagick.org/"
 
 LICENSE="imagemagick"
 SLOT="0/7.0.10-37"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 67687ea276c1..7ac9327f5a45 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.imagemagick.org/"
 
 LICENSE="imagemagick"
 SLOT="0/7.0.10-37"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/pngcheck/Manifest b/media-gfx/pngcheck/Manifest
index 96fbd19bfeef..9ee5fa843901 100644
--- a/media-gfx/pngcheck/Manifest
+++ b/media-gfx/pngcheck/Manifest
@@ -1,3 +1,5 @@
 DIST pngcheck-2.3.0.tar.gz 59864 BLAKE2B 3c635555f76d22d6949309707b7054608f5e093d3a557eb88eb9fc48aef76326f8e6b0dbcdf8e30213a042416f0e6f798e41411763e7604b12495b6b2748cddc SHA512 d099a360d41fc553e9ea02e56ae9812a4a72f3b7f1cd73c021fdb0b9233bb247e100b95fe8e297a2dcdd1bb996128a365794cb8f5702e5c93618af03f18140ad
+DIST pngcheck-3.0.2.tar.gz 63202 BLAKE2B 4cc6040e087aa2f5829e79ea1a5feb45af8bb15fa72325f9cb4822169c7d278306d6d89b936fd4c3c3819a09380e07f1f64ce0c276e776c3146c1533b1ee1363 SHA512 81bba699141c0f506ee589785eccc4b1ea882df5d211bcd91885bbcc4230bf14d23fc1298ffc10a110d6a8459522f6a01bfba1f81739f6085e4d3de964bda3d5
 EBUILD pngcheck-2.3.0.ebuild 643 BLAKE2B 3ddd07326f91f14c7efc71c9a0b442d050ab3095ed52336f99edee0e34b325def2d14f18e96ce4c1cd726071b1610fdbf629c898f22a26c500e41954d0055f71 SHA512 cfcc71d19d8869482b92d390b9b4a65e81aa1ac9865af2b914a10e57afdc0b71f2df5738e7283c310604b550ebcd6b99edd7a8f7d3a15539bf72d39bb88e9eb8
+EBUILD pngcheck-3.0.2.ebuild 692 BLAKE2B 44ec2d73dbee688678b367234744dd493278172fe3eec45e5f90d5726b97204f3db437ed67e736136e90b1aa0bd5676ab1b193f8c5e2dc4a534b57568352f5b3 SHA512 c3431d4d0f0c6a00062b794e8a64126d4e495287dd18bbd817153a3dfdb992f379b2d4f5440449d3e49632e33505baaa8efe26de93d6c51d0e01098149be3177
 MISC metadata.xml 244 BLAKE2B 5498c23eb35a869f92ff882d6931f50645f2a10ea31c9e22f892e9c5e11b54cbe7063decd5750b2cca2e8737ca7e5e5e7fa154401ddf8a2baadf7037be981241 SHA512 c6d20cd9c770b2ffa18b02ad2495493b61d681c2f1d54716aaf5a22a63db01219db3f4d3f743ec8abd24cba27bf5e3c0da3b80158a1b06b933965d8481349417
diff --git a/media-gfx/pngcheck/pngcheck-3.0.2.ebuild b/media-gfx/pngcheck/pngcheck-3.0.2.ebuild
new file mode 100644
index 000000000000..ad45b82c58e8
--- /dev/null
+++ b/media-gfx/pngcheck/pngcheck-3.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Verifies the integrity of PNG, JNG and MNG files with internal checksums"
+HOMEPAGE="http://www.libpng.org/pub/png/apps/pngcheck.html"
+SRC_URI="mirror://sourceforge/png-mng/${P}.tar.gz"
+
+LICENSE="HPND GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	emake -f Makefile.unx \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		CFLAGS="${CFLAGS} ${LDFLAGS} -DUSE_ZLIB" \
+		ZLIB="-lz"
+}
+
+src_install() {
+	dobin png{check,split,-fix-IDAT-windowsize}
+	doman pngcheck.1 gpl/pngsplit.1
+
+	einstalldocs
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 181d35c2cbaa..b2e69302f98a 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/gavl/Manifest b/media-libs/gavl/Manifest
index 7ab3bea9344c..660ecbbab322 100644
--- a/media-libs/gavl/Manifest
+++ b/media-libs/gavl/Manifest
@@ -1,5 +1,5 @@
 AUX 1.4.0-x32.diff 759 BLAKE2B f122756759da4cb2a122ff702b688c63bf878801e75080d0482bd8583a935448bee42fe00f50bbd99679e5cc5a3e96b01854dad2882a12a64432782b368750c6 SHA512 4c4408ec7d42e81f4e5913ec4d97cc88290a3729d5990910f0c7d2a86da511cd496bd20574f340ff8786e533f09687c0788ba790746cba56a43403e11b638a3f
 DIST gavl-1.4.0.tar.gz 4592701 BLAKE2B 2ed47cf63d8ce3424d0714e202a11ecef89c5a9c160a6045e238bae4179c02398600fc9c6d914784bb24a86c501f93971631461bdecaa8a70743a674748a2ec3 SHA512 beda0073cab865fdb3a55de5d5c800fabcd40b21c5bb5b5f9d43046db3602d8967fb8b893325fcdaca3fa66d978aa3cae79a4a797d43d40ad50ea5af752a650a
 EBUILD gavl-1.4.0-r1.ebuild 1090 BLAKE2B 09ecaa97c26e2fd046c6cb35eabcffa67f768977409e57c13103e452964afaaf20125689006a766f507af0ca3fd7d57624492de492a7a531624ca5236608d5f7 SHA512 33408ccd8f78d4e2c4d6dfbfda3fbd350bdc65ad5ab5836feb7cad9453ce51fd20b4c5ce8669bb5c040f5951eb7fd9157012dccd8ee853414f7859896fb979ba
-EBUILD gavl-1.4.0-r2.ebuild 1365 BLAKE2B 8ca3082c11cf88f7aca766ba98fcd0f6920e3e7a21d501a5c80aa01fae03102bdb6b76ea760ad41d90f489a15811e9c7b80fb1d52f5d3f9d49996e4bd0989046 SHA512 1d09dbfb300546447139d8e130704a107b973339c25b9b9bd3204196b43cd84b87871e2b683e4634255d2eb692acd09255fec7ba0fac1ef69bd2f67d5dfd4bfa
+EBUILD gavl-1.4.0-r2.ebuild 1364 BLAKE2B e167b7d76166a6b54eb1c4a2fea97cd16d772022402328a4741f91b62b267a742524568455507ad70ad467096e9ad550bdf482cde0a5650d3f275b9cfbc4e657 SHA512 bb115b2b88ab3245556380af677b92503f73d74f6d2ce09e7b6dd1f2247467c3deae3edfe179daac788f9b0faff8550293a3217ed08ed50278f6f22aa11de827
 MISC metadata.xml 300 BLAKE2B f5a360e6d1615f750c91512bcb7ddeefd0e0e43c7f682931fecda80e3ba489175786e759d5566077248efe3a2f45d6f8da4277fd97b886e6a4421390ed06dea7 SHA512 d7d3c4fda38db5a9b9496c557891d6c9f620d614a2d17b166b21426356d0c431c484c25909db20d619ff43d948b67719a240245254d89ff03447be53ada09ead
diff --git a/media-libs/gavl/gavl-1.4.0-r2.ebuild b/media-libs/gavl/gavl-1.4.0-r2.ebuild
index c314b13cff40..ccd9c0e8c0f1 100644
--- a/media-libs/gavl/gavl-1.4.0-r2.ebuild
+++ b/media-libs/gavl/gavl-1.4.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gmerlin/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/media-libs/libbdplus/Manifest b/media-libs/libbdplus/Manifest
index c20ddbf87ebb..92c6b7a9c93d 100644
--- a/media-libs/libbdplus/Manifest
+++ b/media-libs/libbdplus/Manifest
@@ -1,5 +1,4 @@
 DIST libbdplus-0.1.2.tar.bz2 319828 BLAKE2B bdf8868dc511b22fd6926b4b29cfae513ca5c9f30433314c99bf31aefb5842eea1042e514383d1c1ff96ee6c62f3220a542973eb1017df8dd48aecd7f81237ac SHA512 e00e7bc9f52b9275646593b753ba646b052255be94a7241965f4dbe4734f8f6a072973ed4b9997957f939236b0633897c295749f79e232188430795be5b5087b
-EBUILD libbdplus-0.1.2-r1.ebuild 1051 BLAKE2B e0e6f77dbd8041bf1f40acdeccf7bb9d10898e48dc8c3a7b6f2336bf944c39f0742c7f6c0bbe6df796a72a74fdfa8adafeab8874e252dbdcca2a92e9d61aa7c5 SHA512 3975cb7ae80e1f8e82f7f80e57edc02f49ac4641dc11b58c9645dd6cc8350d8007b81a1a5cec47afc5d15ce35e8acb5ce7e23d87a3584cf2f7d54eb4f7c7ea03
-EBUILD libbdplus-0.1.2.ebuild 878 BLAKE2B 831c09aab8f391d25826ca803514f464f02c516e45bcb056b22f8abd09eb3d19f00295a88d1b911942a5698d23ac856e2c24abe5c88cfcc6d1052cd752005f06 SHA512 52a573e72e3f73be093a99582cdd4f5b1284f140502b9fffeea3d625483e89db0eb23cbcd9e17450dfd3c30c7d4f1aaac380faf8aeb099a72a25be5a5d5d514d
+EBUILD libbdplus-0.1.2-r1.ebuild 1050 BLAKE2B 10a40ea3e988f632026a315dbde1d4527578fe6ce681b3b12af65aa90473bec0a6829150a9f736721f261c0c73e890b654dce2cb496982261ac770e85952fb33 SHA512 b9066a5d1a0d9833e8b466375906e0f23b685ad91493f5c5e6b8a26bf03241e26f3864512591915990a34f2960eccb345c6fdea08ca6cfa101a5dff6f911bdfd
 EBUILD libbdplus-9999.ebuild 1055 BLAKE2B 7ab0d4a78535a37eb69577e0bca7af7302928fb37badcbc95d8ae2f3e3ffa632ff2492f3da201e0c586233db3daf06bf26802391dfd6c876b50f0e0cae8b1969 SHA512 18bc5be6402b1dae1324f0f2b7999cbdd502964f307d89add25e42d660f534bb01ee9c403f5d36ebf09f85ca653ef4509d82f2b7e3218ab01af9124f2e8b0b87
 MISC metadata.xml 346 BLAKE2B 7a42d692f3ccc8badbed9bc2d06f4b06891f0fc46d53501de443dbff04b71c6db74f78a310cd484945be3b2035ae001804443bff1a18dcd5b0ef24474453910e SHA512 c45e738ea1fa2ff40738465bcafc8b6c89e7d5dfd3c89250118bc3c531120ee14022c04fe0a2bd5cbe950dd66935be35254239fc61eb947b597328809735693f
diff --git a/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild b/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
index b956259b6818..443d7d1199e3 100644
--- a/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
+++ b/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libbdplus.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
-	KEYWORDS="amd64 ~ppc ppc64 sparc x86"
+	KEYWORDS="amd64 ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Blu-ray library for BD+ decryption"
diff --git a/media-libs/libbdplus/libbdplus-0.1.2.ebuild b/media-libs/libbdplus/libbdplus-0.1.2.ebuild
deleted file mode 100644
index c14911011433..000000000000
--- a/media-libs/libbdplus/libbdplus-0.1.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-multilib
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.videolan.org/videolan/libbdplus.git"
-else
-	SRC_URI="https://downloads.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
-	KEYWORDS="amd64 ppc ppc64 sparc x86"
-fi
-
-DESCRIPTION="Blu-ray library for BD+ decryption"
-HOMEPAGE="https://www.videolan.org/developers/libbdplus.html"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="aacs static-libs"
-
-RDEPEND="dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-	dev-libs/libgpg-error[${MULTILIB_USEDEP}]
-	aacs? ( >=media-libs/libaacs-0.7.0[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-DOCS="ChangeLog README.txt"
-
-src_configure() {
-	local myeconfargs=(
-		--disable-optimizations
-		$(use_with aacs libaacs)
-	)
-	autotools-multilib_src_configure
-}
diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest
index 2dffd8001e4b..5a55c49cc3b4 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -5,6 +5,6 @@ DIST libde265-1.0.5.tar.gz 381041 BLAKE2B d561a0e5f308bed557237b88317985912537f7
 DIST libde265-1.0.8.tar.gz 381963 BLAKE2B 0577623de2ef86e1122b5b5c3642a750bb222c4988a996168e060e8ffd9f5c0787d31331cc8738362d3fc3fb31e8eb659629cab068f0ff1c71de9d15ed1f2ceb SHA512 0007138cb5da0d4cad1e118c01de249580f39c387a11f490d1e1f63ad0968ee2f7951e54580f298b3dbe31e5a3d1a7fa04454e11cbb82beaf8a9aaf56f5532ed
 EBUILD libde265-1.0.3.ebuild 1590 BLAKE2B 48de41d7133072b75f48b2fb954390915085931ec6f90daa56d6d437d130795039c682f36a8b053783e29bdbd4faedda8e15d48f0c50df57ba6b754462ca0360 SHA512 431fdd0871422199e7d9278fb21857e5a9a27cb34ba949767526d9f9ada57e65efe5abe3c4fae464e2bf3f021981a786cdeb84a9917032528cf08de4e30b8ac1
 EBUILD libde265-1.0.5.ebuild 2498 BLAKE2B d001976ca0ac8a6e043d282b673365de75992b25bff06ace079745782db15a94333e3a0a650b4cb23d33710d3e3a49b6ef1eb8dcf24578cc8e107ff58d94ed93 SHA512 c13211859fc8dd695c6e9effd04d15f4771c1be321fb0f8b09c64b8a9c3cdd03c84ab9169a82b507936d76bfcab577906d6c7776fd1c4764e11eab26a3236a87
-EBUILD libde265-1.0.8.ebuild 2355 BLAKE2B 2b0701a6f2c9c2bb24e08fe76844c613befdc9bf16c81695b3ae2e4dc8db3bf58225ad5897e5072ad1ad3e30126e89ca829338812decd31c663ca0530b501d82 SHA512 2605125ee6c33605f6a03282e3c51b1577eb9bc124e348f8a9b197a5dfb5a4698fa3752baec7baf44c592f998b48bcc8125423a83d45e648a577ab8f2505c337
+EBUILD libde265-1.0.8.ebuild 2354 BLAKE2B b93a2ea999b4cee46d9c6c206c2a7cdd0b13224ee11b20e7fb2b30cc0f775c58944901fd3dc3135cce3a988eaa5bfce53961caff1a26a4a28561fb8f3c32e2a8 SHA512 4db8a791e28da5d096fe7d58c316491db31e03b7df90cb5a28c83fe22a7cebb23c95574df2cfa100dd25c0591bf3f10e8403f5209368f764193300015e1cf0df
 EBUILD libde265-9999.ebuild 2355 BLAKE2B 2b0701a6f2c9c2bb24e08fe76844c613befdc9bf16c81695b3ae2e4dc8db3bf58225ad5897e5072ad1ad3e30126e89ca829338812decd31c663ca0530b501d82 SHA512 2605125ee6c33605f6a03282e3c51b1577eb9bc124e348f8a9b197a5dfb5a4698fa3752baec7baf44c592f998b48bcc8125423a83d45e648a577ab8f2505c337
 MISC metadata.xml 691 BLAKE2B 24cf4f5585ca49df6aa5fbed6ab8daa55451446b1ab2d47953e05ce726b22457f1f2adc18774b745206a2f7342996b210edf83867578f86049e23823e43c1788 SHA512 c121ebe35ce66deb54c5d046fb74fb8096d134348b15607f7bc7f0b7239ce76a2ecc43ecee72382adb6078ac6f50859d0ac3a60bd8a3daf52f6cd04c9a56ecf9
diff --git a/media-libs/libde265/libde265-1.0.8.ebuild b/media-libs/libde265/libde265-1.0.8.ebuild
index 29c28d991c82..443e7457bcb6 100644
--- a/media-libs/libde265/libde265-1.0.8.ebuild
+++ b/media-libs/libde265/libde265-1.0.8.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
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Open h.265 video codec implementation"
diff --git a/media-libs/libfame/Manifest b/media-libs/libfame/Manifest
index 46d0dffee889..fdf5b2c91e6f 100644
--- a/media-libs/libfame/Manifest
+++ b/media-libs/libfame/Manifest
@@ -3,5 +3,5 @@ AUX libfame-0.9.1-mmx-configure.ac.patch 1003 BLAKE2B a775cdac594a6b30b78cbaee88
 DIST libfame-0.9.1.tar.gz 296837 BLAKE2B 2c3b2b1c90baa2363ea17ab308070e130a15e2f58efcf00166e724dcf55175179012ffa9874dfce7c9179dec01e0c63ccb0b051d744a326636acf70e796f2483 SHA512 511e7be0bac81482edbe5357b982ad1f4adf2bc784a9f52a3f095269076cd1e42866d2ae24a31b17c38acefc03e2c9d868b17074931e5d320ab5eb52271c4345
 DIST libfame-patches-2.tar.bz2 5324 BLAKE2B 03768badf8a3b0cc5546fed200fa71850c1151223b6b0e2301b56f396e9a71ec495ab2bfbb1ab5bd2c3fbc6f4813928786edfae8876e15c4f742bb09162a85ca SHA512 e4f67b137c3397dd00f8a4d5835a180963c3109c0d239d8f0fe616983a5187f6eaad9f4097cc9eaceb5b9c42de9d9e7518a4174247665a8203a4f69b3383abc4
 EBUILD libfame-0.9.1-r2.ebuild 995 BLAKE2B 2d8cb993ad1778c6afcd18470a9e7deeab240370cf3ba0ba6611a57965aca656403977e74ff2c8437423c91586a42a59efda6f69cde2b2bee4823fd37f52172c SHA512 77373224e5cef3416b8350bfd294d9b5b6bb4a6b0d7dc848dd1a05c8369a5de247e076d6ecfdc3ab9d26442a22fd7efac5734dbc4fad2896850deec27bdbd849
-EBUILD libfame-0.9.1-r3.ebuild 1039 BLAKE2B a8c711b38f9495e836b9302f408d29eab116796a20b3a14ee09d0fec9659e7c3e297cb196de4623984ba2593ca9c6c024d7b23b8c9080b85608a0e1af8d30714 SHA512 ca4e736838650ab4e40859cac79e2c784bdd3be5a8d5f04bd3d03999092cb71380f6456a6c6d72c3d17f59e53984a05cd0ad4b3b6c292fea0b700153d3680a80
+EBUILD libfame-0.9.1-r3.ebuild 1038 BLAKE2B 471dde380cb7fb6d31f92c4600656e5de5f992b7f966300ac01453dcfb0929f687d3cf0fb77a53f1eb020f33273366311cc6cc53b2f9b486bb3033edd8ce6534 SHA512 584adbf9fc0073fd5ce822f5b757796a80dec6d5bd03c71c4012e25d400062b71dd93244d032fc57e72ba887001e0edae2fc4df3376d111a9ecc431d7f2d437c
 MISC metadata.xml 297 BLAKE2B 11f51d49c6584b02011081cb8eaaa00441c9bf623bbd068fc731d0352c568e891654b18ee0c50d6722c31cdd966351cf58ce18947beee1410138b29c1d1c9b08 SHA512 6fad09bf8ac2d08c4e255fc2ae8a95afd410a7dbaaa91fc7467a78ace5a9a9a9cef1ec25ddd676a3c696a5a2714bb3c3f5b180cbfb0fd8a254bab9a5e310212f
diff --git a/media-libs/libfame/libfame-0.9.1-r3.ebuild b/media-libs/libfame/libfame-0.9.1-r3.ebuild
index 443646e1d40c..71650acdb21d 100644
--- a/media-libs/libfame/libfame-0.9.1-r3.ebuild
+++ b/media-libs/libfame/libfame-0.9.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/fame/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="cpu_flags_x86_mmx"
 
 PATCHES=(
diff --git a/media-libs/libiec61883/Manifest b/media-libs/libiec61883/Manifest
index 9284ed571645..726ca4a902c2 100644
--- a/media-libs/libiec61883/Manifest
+++ b/media-libs/libiec61883/Manifest
@@ -1,5 +1,5 @@
 AUX libiec61883-1.2.0-examples.patch 1140 BLAKE2B ab448e0a4941fd87ac8d0cd2cb6f21e3fc784b956ff2d8a1b81cad50a91ac0e60469eb5341d7ff3d7bfb7093fe424a51b63246292b52a62dcd773370fd6a7445 SHA512 b022bd213e82ae0f6ac206512a6764784720ef4e5caf349e39e729ec2a7c6b84c70af9ef02753b76e431707fc36fe1cc076b87367ca3c89250bcc1a0660d4eb7
 DIST libiec61883-1.2.0.tar.xz 233640 BLAKE2B c1fdd4d6fbfd96eea9f1c22b20a1e71e4cafbe064091ef6211d097342f8751955f2d8a68cb3e5235d733f7ecd3725144abb329331bfa3497be1911bb8773d4a9 SHA512 817177081a229c6253340e5911369aab746bd657d5b3d6a1ef3cf639cceee667bdb677fb0536163468cc9e719c4e81c6beaf42c93e5a56eb52684964b6dd1e23
 EBUILD libiec61883-1.2.0-r1.ebuild 943 BLAKE2B 172fa1dc69fae176b893f8f489c756c5535000a572e7d2a580e1f3e65e326e05c43d9c9bd6cd3f0ac540605dca68ce4f341fe25a205d5fba72c087712555065a SHA512 8bde8dc265aa718ba5354bb9a5eaf7151298158bd052f946efe6a2ebc2171b314c911b238556616c04c54de61f8fa06e1895b564bcdaac720b5f13be5dd163ec
-EBUILD libiec61883-1.2.0-r2.ebuild 851 BLAKE2B 60fe73e75f03c0a9af45fe4279f8a15ebb89871adac57813e1d875c3792d4a851f965664f57cafc7e06db63e1cec5d056992dbe71cd9d54bd819072ffbc601d5 SHA512 fa23be3f6f0a009af39d946f52068622e153a9aa7be4a220c08c8d107c6877c58583f91c2da67de91e06d4350eac278bf0b9ed836b2d56e65cc4dbc703ae2785
+EBUILD libiec61883-1.2.0-r2.ebuild 850 BLAKE2B f7e0c426ebbdd3288a8b0fd7269d469acb8189b71a260ddb8dc571e355114df39a6689ae5f98216680c648a14068158cfdb366e3bd682545b940708863c9c14b SHA512 54974d4b4771fd9eaaf0747ec94c0a740deff27f9197e82f4c69fd318841bca8fed9c3aaaa2a42a4a342e5d5658ba287ed32a5165c709fc674fd8f0a70a9de38
 MISC metadata.xml 531 BLAKE2B b3f4a2efce5fb0eb30e14c02ab34a58d4dd4e38b7b5a8b799816fa4ac50fec6e2656652629f351388519f6bf05275448f22fd10b4565884c12bdf054130639d1 SHA512 bbf4b45023f2a7f1ed7769fa4513cc13ec9697eeb677fde7ec882f5f787e00d0b291ef6be1c2d0ace4d35059782d85678c9ac38f8913ffd63f35a82ebfcab933
diff --git a/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild b/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
index 6cd2901e5869..13dd6ab4543e 100644
--- a/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
+++ b/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/libs/ieee1394/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="examples"
 
 RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libilbc/Manifest b/media-libs/libilbc/Manifest
index 8b1bab1566a8..f121a614ddbc 100644
--- a/media-libs/libilbc/Manifest
+++ b/media-libs/libilbc/Manifest
@@ -3,6 +3,6 @@ AUX libilbc-3.0.4-respect-CFLAGS.patch 1217 BLAKE2B 69e46ed5ee1f9ef082b54b6049d0
 DIST libilbc-2.0.2.tar.bz2 392643 BLAKE2B 1b1772c415a823a63c2fdb64913eeee8becdda0438c3942e74dc0be5dc6e000538c8f0feb796d23eb815e792d9b9e695f598869a31dd69a90c1fb12823a09e28 SHA512 ad0ef3326144fa1e9b6983be9aeefcec0064930a0124980f0fa2b38967f145e4cef7be75d8eae72f4a9650f297f15968944e73ef256e642116125dea326d8ba8
 DIST libilbc-3.0.4.tar.gz 1307591 BLAKE2B a914b79c1134536f45910d367216b1ac27d4acb08f4c9b9dd3f01eaf181ecf0f6dc351b944039b05445217360a7e4b868b3aba9f8d6265eeee62a90ce0641a42 SHA512 2239a915263c2a73d83836354d42c670e4fe1173a38b3d1a9cef169778038ae5f4901d8202d6c5367d00db76e034e72bcdf6ac81bf0188f6a3f928e7d36d5a31
 EBUILD libilbc-2.0.2.ebuild 887 BLAKE2B 823f2b98b090736d98a07eb2ad8e1489d02f12f33de72cfa2749058c499ae71098dfac05b875a02a2d9fac09e33fa6e4009ceac866162a168ff6e5a70156509e SHA512 eb28d8e92974fb0b2367bea26bae5443838f45e84535ce2a1890fccf1ecfbafc661a7baf3bf96bf64e89ee375adde735b3965fc11c4b85aa1cd17e8d31790d90
-EBUILD libilbc-3.0.4.ebuild 605 BLAKE2B 08f27610431b3c863541e0d4c51f0e8d3116ec42785327a81da682c8a1fa45a90580f78d8a76d796572bda0db142873287c9128b92e1381cb62a8bc8eed58956 SHA512 d10afec68a9394333f48804c2844d217f9d774b645b0d32950ad3291c30efc303c54f3ef495a86141af67015c1e17c74740657215a773e944c0e76c36ca1f66b
+EBUILD libilbc-3.0.4.ebuild 603 BLAKE2B 8611ee402e005cc2cdb135cb4d6a00793e33ef83d9bee787ce55991a98a1f5704bc6363951ff1e267bed72929d1339fa51c24cc5e5a4dcd66640352e49f3a651 SHA512 758c905582dc0c18d9c57e0b9ddc165d4bc37b37fe67c4c31cc2ca86b2223f14bbfda55682a5a493c17d29cfcdd3cf0c5cc27eb90fe3a8a912c752c7bdc24515
 EBUILD libilbc-9999.ebuild 605 BLAKE2B 08f27610431b3c863541e0d4c51f0e8d3116ec42785327a81da682c8a1fa45a90580f78d8a76d796572bda0db142873287c9128b92e1381cb62a8bc8eed58956 SHA512 d10afec68a9394333f48804c2844d217f9d774b645b0d32950ad3291c30efc303c54f3ef495a86141af67015c1e17c74740657215a773e944c0e76c36ca1f66b
 MISC metadata.xml 333 BLAKE2B b0f35100492df931d4a504ea070e7c5df977bb452e013cdbcb6b82d949b42d9b751862c5b9462b67d3669bc401f843eef664e5e1612400cb9418f22b208b2f3a SHA512 9081154d8e099e7b355ef3b11a49e7580bf1ef2a62dfe3f183694041a0a1ef247a111a982af1ba9cefb3a64dc26a4b0edd45b374087e4bbf044f468eff7195ec
diff --git a/media-libs/libilbc/libilbc-3.0.4.ebuild b/media-libs/libilbc/libilbc-3.0.4.ebuild
index 9f2f31bf171f..ffa5643bf7b7 100644
--- a/media-libs/libilbc/libilbc-3.0.4.ebuild
+++ b/media-libs/libilbc/libilbc-3.0.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/TimothyGu/${PN}"
 else
 	SRC_URI="https://github.com/TimothyGu/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Packaged version of iLBC codec from the WebRTC project"
diff --git a/media-libs/libmms/Manifest b/media-libs/libmms/Manifest
index 4a950d5c1933..84160011960c 100644
--- a/media-libs/libmms/Manifest
+++ b/media-libs/libmms/Manifest
@@ -1,4 +1,4 @@
 DIST libmms-0.6.4.tar.gz 356217 BLAKE2B 2b0029cde3e985b1a0310e7d00acafb54a53606c656fee1b87a086a31ecc1e488aec31e86880959f23a077a20594a6c939efea3e08545a3d47f804ed762395a4 SHA512 9771c697515f5232eaeaff79e68fe15e34d8aa38aa5d3d68525216357223f314c544d71b5fe18d79a77682f41b1b5d9fb5e7c3c99d0cba5723d2e3de31faec96
-EBUILD libmms-0.6.4-r1.ebuild 688 BLAKE2B d0a0323e50f833e32af4963a5c8fc4e812b0368c735397af78312c5335638579f315d79b51161e5463270172b422230091c518f09a2509eecf7bb2d086289dba SHA512 6c62b0f7369d4eb710a87781a97754d9fd4db5ec541dcf576a1b7fe16b9c9c77cc8925a6a0ea34d2731dca13f1c7070384b2c9e311bef76ab2c24fa8b2315f37
+EBUILD libmms-0.6.4-r1.ebuild 687 BLAKE2B 572fe7f67fb62fa39a0d3e3b50c0e9e6e927b79370e1c9f27052046f3768699de5521e06678f3f853e34daf5355b709710495a80eb3912b0c4afed9fc9786800 SHA512 87b269d52b44adde51055ed940153f72f29a93bc9f06b56d2e5a6ef83a1270e444021bcd792025c563cca942034ded713f973f8f88e4c1975940e43bca8c6f9b
 EBUILD libmms-0.6.4.ebuild 636 BLAKE2B 10e4eebbdfa1b21b0b1883a76b95535e840c09bca39af8a0283ad86c604add9a815c7f48178f73c18e2f46a5a3f0fbb8a76cb03bd87b72bfd47a16a45d3ba88a SHA512 bf4fbba5e64f588fe5624a359ca654be47fd047368a94d793df63512823afe30f9161a02a9472e0c484320afb2b36b949421d8f0fc2389d37e65133a44fba1b5
 MISC metadata.xml 358 BLAKE2B f61ee71ee2acfcaf289a33d28efed96cae45933a0a0434f53e2fd2196722eb3c2f4d2f75a39f31bbbb630d11b67bca1f6d43c95349d3f97560f6260bbfa50082 SHA512 c9c5cc18c8b1ea6dcd96d280d74a811f19f7a93a866b95263454d46975f876791559799dd2e036b24f41e8c10d8130e2a4b200aa71f087f44044ebadd5d9aa95
diff --git a/media-libs/libmms/libmms-0.6.4-r1.ebuild b/media-libs/libmms/libmms-0.6.4-r1.ebuild
index cf67f02beb88..87f7331674f3 100644
--- a/media-libs/libmms/libmms-0.6.4-r1.ebuild
+++ b/media-libs/libmms/libmms-0.6.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index 8699d82182ba..bfa44c185085 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -1,6 +1,6 @@
 AUX libmodplug-0.8.4-timidity-patches.patch 557 BLAKE2B 4c26c285bb2f23057dae320ab3488e13dbbfb420f8185fd615732912e17f416537b4d210cf8cf48745a3b6dc2df8be49274904626e9db432f2f347dacfbe99a6 SHA512 4fa8bfe0665713b65b0b3f9be59589c98c7fbe5aa278ee95107fd1b91ba1a25fbd20a86bf91ab7eb7e160f522e04dc78838ada6298d4f5c1905b528c1fd7a57e
 AUX libmodplug-0.8.9.0-no-fast-math.patch 437 BLAKE2B 7b4f449d4906480b392b2ea93260c816a2418678a6f5209c6d00939830c977161c6d481a34830e0e0b39400adcf7af8665df63091580bd3db84841f7ee8158f1 SHA512 f07f8e3efdb4d15dc8916c5f62429f2d51a0342743a2bc881b44fcc8cb689fe973f9089815c2eb3ba469e622e9c4f86a7c4f5b6e5bd78d506aa7c69b80426653
 DIST libmodplug-0.8.9.0.tar.gz 576566 BLAKE2B 534ce23f37ae60593fcbf0b8984140badcf7d868a7559ea6aef282a4d14dc6ad05847dc128a0221772e1dc2abb8c870ff8d6d46da0c04232169f905468a3ba19 SHA512 880e10154fd367ee24ace53ca7e32a5c1fee7dfff1f934e6499944c12779427da63e2f55f8d6ce25db0a42a5b4424053bf64305b31dbfc4ef6a8909924d655fd
-EBUILD libmodplug-0.8.9.0-r1.ebuild 834 BLAKE2B 53227aada07bb24f80e2a0b11d99ad787f40c20f5076567b3b9114bac311dac2cb61ecc5751d847536a2793450d14cd89f51ac7522d34399b985cbd58375d151 SHA512 36358b5c545d22a58bef32b198fe4fa62f8421b05d40851903b7aea56af54202147b22dea77d720fb521c6958d3e53bea7b81dcecbaff771c82c30f28e242c98
+EBUILD libmodplug-0.8.9.0-r1.ebuild 833 BLAKE2B 753e00b596fe381746019feeab969da083b71db86ced44288e1b7b91a7a65ca6f52e2ac042e4020bca345777f87c506ee8fdf330a48dd9da944c0e5a40fe82a8 SHA512 33a708974974aa5b028d7e9fb85538bf992b45c0ca550208fec515cf03ec93cbc1c0f4b0838965dcbda17acdd1d7b358be1dd4750beff948df30a57744706f61
 EBUILD libmodplug-0.8.9.0.ebuild 741 BLAKE2B 109d2ddb2adf9b398114dbc7e8fedf82584c089ff7513e3a8a559971727f731fb734974f42ef548a691edcfd2fc43490aa68073bbbeedd074ca14dc35d662db2 SHA512 b9cfbf0f1b9b2ad38795df9242a8e47cfd240529520561db0f884af7843a8796f4f14fea84d0bb9edbdc94285b3e189adada3962f0d39c4a67341425db784856
 MISC metadata.xml 457 BLAKE2B 2aa3262e69e5eb85c8ee24f912b126c38554bb324652b7a2b91620236a72b1717ce0ada193193d9655883f8ce48be622e85934a8acb69f35e78bc59616d051af SHA512 6b4cb6e098ed3d743e76d98da648ef475288ec82273b7fbdd73bd60cd14e58d98f0798244bbd4432e504402655557aa0ffb5a4104261c5916261e8040430e46d
diff --git a/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild b/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild
index 464179a35ebb..5609e526ea88 100644
--- a/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/libmpeg2/Manifest b/media-libs/libmpeg2/Manifest
index b07bee16fa80..617b5109ffb0 100644
--- a/media-libs/libmpeg2/Manifest
+++ b/media-libs/libmpeg2/Manifest
@@ -4,5 +4,5 @@ AUX libmpeg2-0.5.1-armv4l.patch 566 BLAKE2B 3c3c87dac145bb4f447cc0657da3eb703c61
 AUX libmpeg2-0.5.1-global-symbol-test.patch 1931 BLAKE2B cc9ace2ef9d6b9f6fa8d0918b627a4f6dc47e5a5d1ed05d60e8a6b9a01451e33be5c5a2732a2aaf1e1ee97eb61590e1f2b0cf568919fc379ac974ec7a849ca55 SHA512 a9425f3cc3a3d6c660bd5c780906927827cdaad27a9526fa57d9026a100ba44b99aeea34c9467d1373316164cd7b36f8357c9aec2c46fa5c8b4557fab5cba2eb
 DIST libmpeg2-0.5.1.tar.gz 524776 BLAKE2B 29b71740fa601c668a8f5b0a43aa763bda2fc66587f5bff847d4bc6d03dd831abe46428616b770aaaabf2d42877daad8c305ab4dd988cc91a4c90decfcc19c9a SHA512 3648a2b3d7e2056d5adb328acd2fb983a1fa9a05ccb6f9388cc686c819445421811f42e8439418a0491a13080977f074a0d8bf8fa6bc101ff245ddea65a46fbc
 EBUILD libmpeg2-0.5.1-r2.ebuild 1479 BLAKE2B 71e2d52780f78bf9718f0f9b4912bd90b8f8a69073abb6f09acfb221653f24e17e2033a64127fa28a8b25150535cec04964e0daa37abad2c85d60cc02c1ff0f9 SHA512 6f4b0fd8d2554e94820016584308247c32a17d311feacf5527b708af22876bf47ae6e336cc84ac4211528300b1d93abfa5fc76f77fa9a0641199901d9769792b
-EBUILD libmpeg2-0.5.1-r3.ebuild 1315 BLAKE2B ca3a6153a275c62edbef0f7b0cdb73d9573a19a2a6e2da4fcc3b004e2bb014e47392f69a7a4f5b2e17f54627ffe2d823e2ef29baeac123dd7c61df2262d6314d SHA512 2da745216f7e2f4a561e6a468bcd13f7a5e4d55daa0899239dfceddc7e773881a95d061a7a9251370e4e584bce4b339e72d8736160584de07d7495e7bc980fd5
+EBUILD libmpeg2-0.5.1-r3.ebuild 1313 BLAKE2B a4e289a342f06985e89c36790535f9098c8dc36a5a2088bffba3028d8727266f8117c4e10e404ef3b142f83f04f10d30c512734fdae080363b31320a147cf755 SHA512 6e3df51013b0a5b9acd15d03e432d4dd1943225b242f97e877db6397ff18728f6dde84695c11c4edadaea6a648e662c8abe11bde1db55cdd716cfec2144500e4
 MISC metadata.xml 301 BLAKE2B 4d9999b8b7aa1066cb76987da82251084f2fb73a2891392a1b3686119454f7c19ef34d3f5e362bff0db40050790c819606c79fffc74cee1bb780d3edeb7afa8c SHA512 ae5643be12156110bdfe381eef32d7586350eb5d70ee8b431f34a19a1b45dfa2cd1ee28d5b0101fef05f90b5d72ed767163051ce91cc1e9107c23432a29a1b46
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
index d149847710e8..869573184e56 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://libmpeg2.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="sdl X"
 
 RDEPEND="
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 6f5ffff892b7..ba7b70289fba 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,6 +1,6 @@
 DIST libmtp-1.1.17.tar.gz 829529 BLAKE2B 7e7393aaf0e988029382d30e260d651ad1166a89a2af32a3da544cdb85eeec1a026eaa40d131096eaec0686b92c4e25663ec5cfbe3916a522ebafd38f107744e SHA512 f2648e259529bd3dfe74a7049a79c4b0042bcaf63cc1fec8b232b66312d62e9620280e4f725312c9ef8207f1f1ceac19f460a0a8772a3cc6c7f0b00ead01add2
 DIST libmtp-1.1.18.tar.gz 832463 BLAKE2B 136033e9700fcce6d5092f8f5f896ce40b2ef659d638bd2e432fb7522c1c4e7e930171198ada5c67c0f5dc7c94ed36ec7d2ac8f4faa3bb335d4a8abb032ae2ef SHA512 1a8d503effd83217c339a1aea3a16954d718059edf3110cb2f21cff74cdd1243e7f4880d4e12f8fbdc9a5deed366c4151babe6ecd6f4cf4b7330a27e27bf7cc8
 EBUILD libmtp-1.1.17.ebuild 1582 BLAKE2B 6598ad68e51ea6071dba3cad5a51944277301b30864400eb9803b9259a2715360b9d7ed6241fc6f59142d5ccbf1c4d33595067e22c0151354f04ba35e3a86fc3 SHA512 1ccdb125a2fc6f0cce2e3a087db830a7559c094afc87cb11f291834eb42b9719cd4da57e0c41ab61e34b0dca334fd5d19fdc33282806752a052e7701759aab70
-EBUILD libmtp-1.1.18.ebuild 1605 BLAKE2B 5323e0b427108d356bd879a991f4e6d03c897d4fdff985c22ffccebd458a81c69a2492d69592f28774aac82540cb0999cd12061558592d16eac7685a84597cd4 SHA512 63a027b8b143608dbe555369d131798b5b7298f49d814265b5499af15bfaca8ebb860399fda2e8366e57793bab00ea6db5a2a842ce3741134d9fe25952914c43
+EBUILD libmtp-1.1.18.ebuild 1603 BLAKE2B 1b74824b3e8e830871b69e0b1ce57161a9809a0dc84e673cb6ec8f95ddf773e588f42ec8f36c027c6905d4f943471d929d551a177306b324f5d664580c20e6f0 SHA512 ab15391b38fd2689055611374b6be325215e7466b241b8f8e0be52d7fa9ec3d19edf324f03f3dd2220572cd4eb9e8805abf5d3b24229750e71e59316eb4bfd38
 EBUILD libmtp-9999.ebuild 1587 BLAKE2B db65f8bbe716f8ecc2b2700c56b430fe239230e2950acca1f6f732d3d92c25e2f2d8a77f55735ece0b31075b1e131d9704f39d1e5865ff60de6edd37791c8218 SHA512 c35a6b0fc775992d78b84e6028c6480e7744e400b1543c25f64936c4b46816aa63104f82602e00f7af25705e9d7832b7f049a36ea6edc739e672ad57649a837c
 MISC metadata.xml 447 BLAKE2B 93dc7722951975ded85fabe8f53c75317b6981561f8848ff52ffa277a93b31ed626e9c97fbce4ce62d40fc186f473059cc036398f218abaecf692e0683e2f439 SHA512 4ddbe48062ced53c6ce5473a837e449251933ae248d04c14c2008d35ce8f290bfcef67aeb31a9d29e53bb54377df5043e89c98ea2744896c1f106785e3b4c212
diff --git a/media-libs/libmtp/libmtp-1.1.18.ebuild b/media-libs/libmtp/libmtp-1.1.18.ebuild
index e9755bfc4201..3fa8ecfe7a3c 100644
--- a/media-libs/libmtp/libmtp-1.1.18.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.18.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
 fi
 
 DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index 7ab172ec7c5d..ea8fef1f62ad 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -1,6 +1,5 @@
-AUX libopenraw-0.0.9-jpeg-9a.patch 590 BLAKE2B e43ddad7d7c3e48a633bc8e8acc480ac610b505052e267a175acc56c2036d9d2bc2b9127184d30924661243c3a595c2caf3a6eb6443102890d3620095b84108d SHA512 555a4ae729fb4163d7a26bc577fff9257bb326712d8c59f4c4d36c1398bb7ebac26a2f961d22676d9c97812a9fd6433f802ba2d9fc94a5c07e18de60e59c682a
 DIST libopenraw-0.1.2.tar.bz2 563981 BLAKE2B 60332274c72602e5b3eea3e41dfee8c62303a2f09028df4a637cea6f07391d912f354752cb6f354e06dd9e223dfabe5dbed1d50e0f325d85be42fb5012ecede6 SHA512 edd7e5a71feecbce1d5a20622bd3c7111acd2d4792038fd19920367ebb55d2cc7614627b9739512bbe34d6b5ae2eb65a4da9cee70c400b5cb846bf5fff08efc8
 DIST libopenraw-0.1.3.tar.bz2 565458 BLAKE2B dec7cda78b6ff4b1411b93c0d48758920b73e087eaca3c262a0850eb5a3423fee38ba7537694b1a04bdafa6bbb34b290c059f483a5a6af339b76c132ac77c413 SHA512 c56d84610f0cf5da970c4c0c791fccf2f7e9f7c7dacf2aeac0b2702ce9a0cd3aaa2f6db0794b0466e1dd8316771973db1e64d013f635c1166b7ff2eebdcbf029
 EBUILD libopenraw-0.1.2.ebuild 1123 BLAKE2B 4cbed60099d06ae4a7743a1e0b51ec96cb46056c9c6edd297780ea1e2b381d5a982d5eead5638e427af6915e159637997f5779e1791a9ce0d55b69e1103a55b3 SHA512 22d5fab05fb48453bcb7af6b752d4aca51e6574369795b8188fc0375476b82e7953aab98fedc87756175a96b98ea267d779fc68c87f32b662deb2f1048a31835
-EBUILD libopenraw-0.1.3.ebuild 1129 BLAKE2B 0cc1afa57570ff5844d593e70f387b15da8a9c6ce736ff903040b144840757aa3937dbc60d7a4a9d86dc71533731b4066f2b8c9efdfa4797f674b1434d0be48a SHA512 e72348c0051972daf41d9b96bb6afb6f16049c18ed2cffbb4f338fc2c9a642ccd2be4e1aadd559736ef5a6107308d89f24a2d0ffa7f0d1beceb649b4748ae4ed
+EBUILD libopenraw-0.1.3.ebuild 1054 BLAKE2B 5aa34633493dd9a828f05e3094afef13736360724f97933c18c26dc1093d62de25fa629c1b5d150652a2966db63c2b5693049e412ed1cf5031f64ff367f67bd8 SHA512 e655caca89bce30cb6ec456b828a6e49ec7b6ce16541080ef76d0b0f202b7ccf0c04c48b4ab5a9dc259f64ea7c8d78dd6a10e2e145933b15b74abc577676fadb
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/media-libs/libopenraw/files/libopenraw-0.0.9-jpeg-9a.patch b/media-libs/libopenraw/files/libopenraw-0.0.9-jpeg-9a.patch
deleted file mode 100644
index dc8f0931dad0..000000000000
--- a/media-libs/libopenraw/files/libopenraw-0.0.9-jpeg-9a.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/520888
-https://sourceforge.net/p/fink/package-submissions/4336/
-
---- lib/jfifcontainer.cpp
-+++ lib/jfifcontainer.cpp
-@@ -145,7 +145,7 @@
- 		{
- 			int ret = 0;
- 			if (::setjmp(m_jpegjmp) == 0) {
--				ret = JPEG::jpeg_read_header(&m_cinfo, TRUE);
-+				ret = JPEG::jpeg_read_header(&m_cinfo, JPEG::TRUE);
- 				//Trace(DEBUG1) << "jpeg_read_header " << ret << "\n";
- 				
- 				JPEG::jpeg_calc_output_dimensions(&m_cinfo);
-@@ -181,7 +181,7 @@
- 				src->pub.next_input_byte = NULL;
- 				src->pub.bytes_in_buffer = 0;
- 			}
--			return TRUE;
-+			return JPEG::TRUE;
- 		}
- 
- 
diff --git a/media-libs/libopenraw/libopenraw-0.1.3.ebuild b/media-libs/libopenraw/libopenraw-0.1.3.ebuild
index d3072df54c97..cc1dfc631043 100644
--- a/media-libs/libopenraw/libopenraw-0.1.3.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.3.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit gnome2-utils
 
-DESCRIPTION="A decoding library for RAW image formats"
-HOMEPAGE="https://libopenraw.freedesktop.org/wiki/"
+DESCRIPTION="RAW image formats decoding library"
+HOMEPAGE="https://libopenraw.freedesktop.org/"
 SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="gtk static-libs test"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="gtk test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -25,16 +25,16 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.35
+"
+BDEPEND="
 	virtual/pkgconfig
 	test? ( net-misc/curl )
 "
 
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
 src_configure() {
 	econf \
 		--with-boost="${EPREFIX}"/usr \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_enable gtk gnome)
 }
 
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 65933ae87bd2..ef7ed19d0e7a 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,5 +1,5 @@
 DIST openal-soft-1.20.1.tar.bz2 512971 BLAKE2B be0abb32698d5ea77e8667e1b00fb123673325b0361c711d6c232d96d1add6d5c9a3e2ba7a3d04afcad27fe4f18ae803f690b14c98d198b77c75f1865679081f SHA512 a8a03a2162b5d35e66adc079e81d7fa075b83a3ee1cec3412cb40f7789263ed8bd005beefb7ef995f464dfa43aac22ea0f547b752dfc7533ed9120a95fb92513
 DIST openal-soft-1.21.0.tar.bz2 525483 BLAKE2B 28d44cfddd93bf6637b476cdcc44c5f69a1a8036c17d63be2defdce47d038bf54c29c9248070a65e7c6f86497ed3b79fd5548832bd67a1ebb67ffc363e46de9b SHA512 12e7dca4040765e06658d2945e984af01f21c65b7d44f9daee3a55457c27bd050bf74665e91ebfefdac09739774ace3e7a4bfc02870778cd65268941314aeb3b
 EBUILD openal-1.20.1.ebuild 2092 BLAKE2B e3d8a78ee57873a648aa998fae198327fc903717cea53a0fc4caba1ff407df3618049d8911898edad6b90c546242c32afb3e71858ab54443495d92e459dc7e14 SHA512 c900f925cb5895ce903541043890e2c8289b520c2ebbbd5727da01f166712e6b27ac74513d5322180db2bbe3a134b0c2ebd3d3aeb3206b680324f54a1ecce421
-EBUILD openal-1.21.0.ebuild 2099 BLAKE2B d4886ca2095016d92081ceb4e65cdb0229775726960536e34235825a541eaf703be3f86922d0c46e982b14db925e5a5d889ff93b6e87942d8af68e5972f1309d SHA512 c284b17706eba849ce9827d5649e8f208994947913783d1f95cab2cc2f814f8cd8b4f7ad0cdee263e3ef1c35077714ac84fcfdd5e03323f04c389bdb0af98e7e
+EBUILD openal-1.21.0.ebuild 2096 BLAKE2B 8e493462cdea3a593d3e0694090e1778f33e20133113bba383e53a0477fa8fb21e7f152632d745c816897045196eacb5505a3be84a1d774dced9a54b3f7fc28d SHA512 27087c5a5e3aeef3b639e70487fdb3477dd32a1e6b2f88deae7ae92ac82eca622778e9de3e97007f79e137d2e4580fd0597a727476b0682b6c1cacc00de9086f
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/openal/openal-1.21.0.ebuild b/media-libs/openal/openal-1.21.0.ebuild
index 049cee97b811..632c3eb71eba 100644
--- a/media-libs/openal/openal-1.21.0.ebuild
+++ b/media-libs/openal/openal-1.21.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="
 	alsa coreaudio debug jack oss portaudio pulseaudio sdl qt5
 	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
diff --git a/media-libs/opencore-amr/Manifest b/media-libs/opencore-amr/Manifest
index 1cd121102346..46604cc4174d 100644
--- a/media-libs/opencore-amr/Manifest
+++ b/media-libs/opencore-amr/Manifest
@@ -1,5 +1,5 @@
 DIST opencore-amr-0.1.3.tar.gz 881105 BLAKE2B e9e1d40b90aa819d1b4fce328ae8ff199c7656f3326199c005e8f0a47e4e3282ae02f93826e923c5128c4ec4cebc3f35b6f5ca9f3f49c7dd15d541fb77383d28 SHA512 f67e84604fe3fbb87d608343e595503e2057272fa0b3bf9158a176e88a96d272c35149483c3ee47ba2b064bd6b17cdb315888a5285aa82edc0401f17d2ae761b
 DIST opencore-amr-0.1.5.tar.gz 929581 BLAKE2B 4943a27f0df3d874720c87f48c523d9aa4cce849dd0a3c9183466416a0629aa02dac8f01646e469e8c45438bf3c57047eb11e69f3f1b261449a0989a36639e59 SHA512 c324db9dcac5a31bfac633153bc054bfe42d5ff98202c4adb3c75a3fae9792f07f60d48cd659acf106dacd307174a62b2aeee22a4af53caa20d2bfba46488faf
 EBUILD opencore-amr-0.1.3-r1.ebuild 526 BLAKE2B 3d06bda1b612ac43dd04ef723c46ce15a8237dbecc901b170b2446cfb4448a697ee5881818b1b6b21f628c4f088ba6f7e79f98cb9671df7b27102fc2aa4f7696 SHA512 33d1cd7e49e92b536bf9b0a1fdc35c2aaad733d2342af0a675b96ef25896a32231250343378b30be4e9ddda010f163f312eb722344b75635462be23117a3232f
-EBUILD opencore-amr-0.1.5-r1.ebuild 628 BLAKE2B dea01ef2f7f5ed940b2f8de00960e46dffa45a10527f4dd22eb51e6f1c2e2193dabca84e8549e25fc3e2e8b1f01733f46396c583efabcd4e2ea610afcdf6b3fa SHA512 c93f369e4f35f18aae0f68969f001039c9b41ad8efc573ab257144565bf97a7b3d9ff4f0861b2e86cd74799386a35804b92a78ff89dff568ebecf2f376a7fdc8
+EBUILD opencore-amr-0.1.5-r1.ebuild 627 BLAKE2B 84ddc8192012c274710f23ed4788f1e234ee2aa2d6c22ad9ab6a0ff6c414fcc41efcb86610612ccc5bef8ef291d7fe6cf47c48f9509060c787f9a412a9c6f1c2 SHA512 a202aea9b5396d4f1482b873793d33a34261804b510800bbe3027990d6b3b9cf5d3c105c6669decc13479770f0313ad0a8b670b3018b9857a88c0e2ea72c400a
 MISC metadata.xml 335 BLAKE2B 62ac5499e6bf0ca4ebb5cef78982a734cbc068fad39764b545089233f2c611937c4d8cddfa7f042705c7f7849a44f1e971431667eae02e7622d45f5b5ccdfb14 SHA512 25f894f204476ffe7bf81e7e81b16f569b34ac57572cba903bf447a53699f0e4cf5448fa27689b4baf60753e7f605f47c4a7d60f19616446b0c1f871d9b866e3
diff --git a/media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild b/media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild
index 6a392d10cd7f..92234a069898 100644
--- a/media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild
+++ b/media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~ppc-macos ~x64-macos"
 
 multilib_src_configure() {
 	ECONF_SOURCE=${S} econf --disable-static
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 169d0f8d8e1a..450b65833b28 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/kodi-pvr-demo/Manifest b/media-plugins/kodi-pvr-demo/Manifest
index 4ecbbbc88e9c..09e791f100f0 100644
--- a/media-plugins/kodi-pvr-demo/Manifest
+++ b/media-plugins/kodi-pvr-demo/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-pvr-demo-6.0.1.tar.gz 41271 BLAKE2B 71fc5d308ef122929f62b140c6aa4561a305a5c2dc34b289f1cebb116ae14637da02e4c1546e57085dfd389ad8a02bbece82af53f4a03ba583ef162eab7b1ae1 SHA512 cb1eb595226543b92878d2a3a717a269647524baf6429518637d1fa1fd2d46de9a2e9481831760e9647da529a4c05bc4d1f1a54c5474d030d1d3ac92b74100c6
-DIST kodi-pvr-demo-7.0.0.tar.gz 41620 BLAKE2B dd7b99623e6b7e1d994b6cf06af30626b91cadd9af8d4c378c13af8e7d77344b7a7162bd076ebe7e35c4a322cc245edf9ed162f05d36f50c3f72762f278a6fac SHA512 50ddb76182913aa6f9aa7800fa77d7fa45fc71468d5e8443b35b6746c62c2e81a0855ca2bdbce7c2b905562cd348464017535412103e8fd46a322fcf93293b13
-EBUILD kodi-pvr-demo-6.0.1.ebuild 645 BLAKE2B ff415ce8f2bb05a79501172ba483fdfdb4f3a7024378052c490f8a7e1efb2acc727f8a449b308269b2c2961b0b38388f4c5bcf1116d84d86dab61db7bb0f81a9 SHA512 0eabd03dde4511dc165fcab1c007eceffb55fa0fc128ba888420aa665ed7a9c723e934c097d6f5375ef8e8e2667f067e10cfd2be2e801d1f0f7e77ad383922de
-EBUILD kodi-pvr-demo-7.0.0.ebuild 645 BLAKE2B ff415ce8f2bb05a79501172ba483fdfdb4f3a7024378052c490f8a7e1efb2acc727f8a449b308269b2c2961b0b38388f4c5bcf1116d84d86dab61db7bb0f81a9 SHA512 0eabd03dde4511dc165fcab1c007eceffb55fa0fc128ba888420aa665ed7a9c723e934c097d6f5375ef8e8e2667f067e10cfd2be2e801d1f0f7e77ad383922de
+DIST kodi-pvr-demo-7.1.0.tar.gz 42340 BLAKE2B b2c094127a66c0db8a43783483b0fbf998e30f649d5deb4123b8bedc9bc01be1bea16811b8bd2ecf5e363610a44e9855d2d1bbd71b9fe4bec951ecd0fdee5f7f SHA512 f889f1b4ba1c882777c15262486396152ac3ab6623b117fc6a799cc997163cc90822679ee69a32edd7dc40b755ce279326e3692241b2af1c3bea7883b3120864
+EBUILD kodi-pvr-demo-7.1.0.ebuild 645 BLAKE2B bb4ee9b5989c1950672511adb5483312a274d72772d26b6556fed2f2a968d805e2ac0d7ae02a726cb3e807559f2ab2205c4b10100290a75fd241c8f19fc70bda SHA512 b229363ccf6423298714e9de62288ac990a0f86c3356784e427815ea47210179123d1d9b7d20355d628140440985e18c016de09044d974dbd35d75a34444cd26
 EBUILD kodi-pvr-demo-9999.ebuild 646 BLAKE2B cd1cdad1b6fbd450f79c2e16927f76db90734062b66a185070e42ff06590c404e1736ee42fd42ab10229710c9307b2da5824b7b513434d2e2589cb2102a4cb56 SHA512 98b19d4b466f173b0b14dd3a56c118a6b3d6822a977e8bb922bbdb1314310d55478288082feea641f8280d1758cb3a3d2a680a004e7654f1f383c8fe684afec3
 MISC metadata.xml 366 BLAKE2B 7e2c022e027a3c4d0c1f5d5aa889b390fa079d8c71b16ea773403b9bbce28c7dae01d370d741575255b20dd4b7cf1b9d3f58161ac271c8829ed26d65920f5876 SHA512 379194149299ccced43f0c2054ef9fd8c049e4d9397c062ece4dd2e517f1f10a670cf53626daf7f53261981ac346c38e7aed9ae0710527843051a2d861c7f655
diff --git a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-6.0.1.ebuild b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-6.0.1.ebuild
deleted file mode 100644
index 8f0fbad7e073..000000000000
--- a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-6.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Demo PVR for Kodi"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.demo"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.demo.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.demo/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.demo-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-7.0.0.ebuild b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-7.1.0.ebuild
similarity index 94%
rename from media-plugins/kodi-pvr-demo/kodi-pvr-demo-7.0.0.ebuild
rename to media-plugins/kodi-pvr-demo/kodi-pvr-demo-7.1.0.ebuild
index 8f0fbad7e073..cb6e25589b8d 100644
--- a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-7.0.0.ebuild
+++ b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-7.1.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
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 27b0830de22a..913eaefe886a 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index ab21039dd67e..5134fd301a9b 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -4,6 +4,6 @@ AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
-EBUILD pulseaudio-13.0-r1.ebuild 11361 BLAKE2B c03c0bb181c11906ab7b061dfb16f8b01fc6b18e7350f3f9925f1d3bbf74fdf8926c6edf58f2c081e7a48e5e27dec45903bacb6f235186c5b17c152749770b17 SHA512 8e9511ef8a349f011280dd136e2ab0b45cdf324c4c3eddee69268fcc2feb7e4077395c9122b98a5d7726573756dd3753f45d92f0b1b962f85913ef96cbc3f0c0
+EBUILD pulseaudio-13.0-r1.ebuild 11357 BLAKE2B fc0488840f107fcb79d6d397608e37d9fcf60333e469efef9a903eaa95dac057e20a0c36f280f3ba20c773c3402b8efe54573ed75934153516a4f50d760840d6 SHA512 cf349d2b5a01be5e3476292d6730f59b789ac2cdb38b71e358a09cd32ad28fa47dce68b14ca99de01c56ceba462666e895c28f6e166ec93fe9e5999ff03cdf60
 EBUILD pulseaudio-13.0.ebuild 11572 BLAKE2B 1cbf83260874c9af3f16942054fd3f6d49740c45efc917e1df0794bb5d7e39d69cec65eb56954dcf6e6f83c430f4bd65aef1ba07e94c5be8874c5179a082526c SHA512 98e9336312c8f9e2d6f0c715d22d3cfa193ffd6a8cf6e05da03756dfaf9be6aa05293f5554d4d923ad67d7eaeab9718343d156873db62997a97e1dec445de019
 MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
index 891740778bdf..e1d9129fb450 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index d44f27d36e44..e7743e808d3b 100644
Binary files a/media-tv/Manifest.gz and b/media-tv/Manifest.gz differ
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 1f5373be1665..3040ccfd2c7a 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,11 +1,9 @@
 DIST ffmpeg-kodi-4.3.1-Matrix-Beta1.tar.gz 13477440 BLAKE2B 49415f76fd2a888b0efadb19597bd89db65c3d9e1224ab529ff0d73ab5734a23982b4d4905ddeb105ce59a816c4642cdb9f5568b0c39c29f5fb9431f9623d4ec SHA512 ce43390e816dabeed4ca231f5f7adade6c721c38e17996a57810fb6025ea49b812133c2a6e29aac7c674d4e4af3a21dbd7e605d85fb966935a01bda983b884ac
 DIST kodi-19.0RC1.tar.gz 52332966 BLAKE2B 305793e2a5f16f07853a82e8f1953a56baa4159c9eee762aee40e8b6692c317cb83e7713d99cbb767cff0c1ac2a2d8bfc3837525d8ad4c854f114f900ebdb294 SHA512 c00d73d46f949eace856f762f9bd2b854e4c8db271366a54c26e18a9b960e04b26f2d4344656be18c79cfa42dfdffc6cd75e4df941268ca9bcfa17f4a987fc81
-DIST kodi-19.0_beta2_p20210112.tar.gz 52338993 BLAKE2B a7b8a33e036af7f902da7bd79d041676e76005b934e30375a956e830a05d3a7b50ac8c906a6032fe4d56caf2460823d5cab9826f6c2b45046ae6c6e07e758263 SHA512 18aa5627c2426e74ad49cd7d66b1d5369d103daf4d2bc857f12e7807b82c5e1a9ec93ab284729022ea12dbe80fee8e7aa81dc9bcc7c8fd3a3fb80189136a4413
 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
 DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
-EBUILD kodi-19.0_beta2_p20210112.ebuild 9095 BLAKE2B c1e3dd57f481544c0cfbc5edf7f2a978fef1dd830297a1dc22c83b0123044fa9e7492d7fe8de9cf7b85b423743298ee76e93d7876c1663190fdcb84835634c60 SHA512 4a09e854c2f912cc0e002cacc278a933bebbce9bfa5f03c2e2d18bcb7432fc5429f64a81a48ec6a325f84eaded12f6ac753784aa743d89cf2899de3c401d72af
-EBUILD kodi-19.0_rc1.ebuild 9171 BLAKE2B ade9b23989f1b74ab309038a68d45dca816fa2c657ff9520003bcbc9826e2843d2e304e1a0b0deac8f78526111f0a6c26d3794319e25e85dfe240a0f3d76b031 SHA512 62921fc19e82d83fc11e4c50473ce3eb085bc8ad8c4629d038291f43be72b5409ffb36b205d75576876041cce44efa0a9a66f652cc4185395cba572a8f495b5c
-EBUILD kodi-19.9999.ebuild 9171 BLAKE2B ade9b23989f1b74ab309038a68d45dca816fa2c657ff9520003bcbc9826e2843d2e304e1a0b0deac8f78526111f0a6c26d3794319e25e85dfe240a0f3d76b031 SHA512 62921fc19e82d83fc11e4c50473ce3eb085bc8ad8c4629d038291f43be72b5409ffb36b205d75576876041cce44efa0a9a66f652cc4185395cba572a8f495b5c
-EBUILD kodi-9999.ebuild 9171 BLAKE2B ade9b23989f1b74ab309038a68d45dca816fa2c657ff9520003bcbc9826e2843d2e304e1a0b0deac8f78526111f0a6c26d3794319e25e85dfe240a0f3d76b031 SHA512 62921fc19e82d83fc11e4c50473ce3eb085bc8ad8c4629d038291f43be72b5409ffb36b205d75576876041cce44efa0a9a66f652cc4185395cba572a8f495b5c
-MISC metadata.xml 1796 BLAKE2B da81fcbb0abedc4f78e82fa6f9453e4ffe824b1cedefcc9a1261dc09e0bd43482a7bd03e908f959d1a3033c284188d79644a1a9bca5064836eb3d0908b7d0d7f SHA512 d76d9f8d4683df4ab488dd30852437649810d0b093f0590db8f95404445f25aca7efdaa9d706d3222d67104cb2c4b02896154fcd7df1173b0bfe7e2557d73847
+EBUILD kodi-19.0_rc1-r2.ebuild 10318 BLAKE2B b56eabe6b72a5136228280becf222ce51db719577c5885483a4fd9150d106cf830d0443604e59b15d9c9b9e43bded73925b5be46c66e28bf5a3d68d62b11b0c4 SHA512 bcb1a21407f790c53a3ba811794bad64572047365df7e6056db5cdc3a6a17b87bb3c33c3c58334c258d559a82b7706c0c21cdbe1c8ca225541d727e7334c565c
+EBUILD kodi-19.9999.ebuild 10318 BLAKE2B b56eabe6b72a5136228280becf222ce51db719577c5885483a4fd9150d106cf830d0443604e59b15d9c9b9e43bded73925b5be46c66e28bf5a3d68d62b11b0c4 SHA512 bcb1a21407f790c53a3ba811794bad64572047365df7e6056db5cdc3a6a17b87bb3c33c3c58334c258d559a82b7706c0c21cdbe1c8ca225541d727e7334c565c
+EBUILD kodi-9999.ebuild 10318 BLAKE2B b56eabe6b72a5136228280becf222ce51db719577c5885483a4fd9150d106cf830d0443604e59b15d9c9b9e43bded73925b5be46c66e28bf5a3d68d62b11b0c4 SHA512 bcb1a21407f790c53a3ba811794bad64572047365df7e6056db5cdc3a6a17b87bb3c33c3c58334c258d559a82b7706c0c21cdbe1c8ca225541d727e7334c565c
+MISC metadata.xml 2173 BLAKE2B 215b9c89db7aeeafee461b8781d791d659df4b0c1ecaf6d61e0e1894b22de3624517f7467f4f601c44bd9e1cda1398de9b3a1dc658e082005a9015d097381257 SHA512 79cdf64a1b431a4fe956fa478526b9dc3d58d5b048d2bef27f04a2b91b319346db840ccb7c54fc6c600d708e2dce14fe334b1669e0ab5a70f605dbbd8f6d077c
diff --git a/media-tv/kodi/kodi-19.0_beta2_p20210112.ebuild b/media-tv/kodi/kodi-19.0_beta2_p20210112.ebuild
deleted file mode 100644
index 81aeb85411dd..000000000000
--- a/media-tv/kodi/kodi-19.0_beta2_p20210112.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="libressl?,sqlite,ssl"
-LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
-LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
-LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
-FFMPEG_VERSION="4.3.1"
-CODENAME="Matrix"
-FFMPEG_KODI_VERSION="Beta1"
-PYTHON_COMPAT=( python3_{7,8,9} )
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
-	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-else
-	GIT_COMMIT="aecf662b642fef7fd8388135bd23d842094f0690"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	S=${WORKDIR}/xbmc-${GIT_COMMIT}
-fi
-
-inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-# use flag is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	|| ( gbm wayland X )
-	?? ( mariadb mysql )
-	bluray? ( udf )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		>=app-pda/libplist-2.0.0
-		net-libs/shairplay
-	)
-	alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-1.1.2 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	>=dev-libs/flatbuffers-1.11.0
-	>=dev-libs/fribidi-1.0.5
-	cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
-	dev-libs/libpcre[cxx]
-	>=dev-libs/libinput-1.10.5
-	>=dev-libs/libxml2-2.9.4
-	>=dev-libs/lzo-2.04
-	>=dev-libs/spdlog-1.5.0:=
-	dev-libs/tinyxml[stl]
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
-	')
-	>=dev-libs/libcdio-2.1.0
-	>=dev-libs/libfmt-6.1.2
-	dev-libs/libfstrcmp
-	gbm? (	media-libs/mesa[gbm] )
-	gles? (
-		!raspberry-pi? ( media-libs/mesa[gles2] )
-	)
-	lcms? ( media-libs/lcms:2 )
-	libusb? ( virtual/libusb:1 )
-	virtual/ttf-fonts
-	media-fonts/roboto
-	media-libs/dav1d
-	>=media-libs/fontconfig-2.13.1
-	>=media-libs/freetype-2.10.1
-	>=media-libs/libass-0.13.4
-	!raspberry-pi? ( media-libs/mesa[egl] )
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d,encode,postproc]
-		libressl? ( media-video/ffmpeg[libressl,-openssl] )
-		!libressl? ( media-video/ffmpeg[-libressl,openssl] )
-	)
-	mysql? ( dev-db/mysql-connector-c:= )
-	mariadb? ( dev-db/mariadb-connector-c:= )
-	>=net-misc/curl-7.68.0[http2]
-	nfs? ( >=net-fs/libnfs-2.0.0:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
-	libressl? ( dev-libs/libressl:0= )
-	raspberry-pi? (
-		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] )
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	>=sys-libs/zlib-1.2.11
-	udf? ( >=dev-libs/libudfread-1.0.0 )
-	udev? ( virtual/udev )
-	vaapi? (
-		x11-libs/libva:=
-		opengl? ( x11-libs/libva[opengl] )
-		system-ffmpeg? ( media-video/ffmpeg[vaapi] )
-		vdpau? ( x11-libs/libva[vdpau] )
-		wayland? ( x11-libs/libva[wayland] )
-		X? ( x11-libs/libva[X] )
-	)
-	virtual/libiconv
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	wayland? (
-		>=dev-cpp/waylandpp-0.2.3:=
-		media-libs/mesa[wayland]
-		>=dev-libs/wayland-protocols-1.7
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
-	X? (
-		media-libs/mesa[X]
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		system-ffmpeg? ( media-video/ffmpeg[X] )
-	)
-	x11-libs/libdrm
-	>=x11-libs/libxkbcommon-0.4.1
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? ( app-misc/lirc )
-	udisks? ( sys-fs/udisks:2 )
-	upower? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-lang/swig
-	dev-libs/crossguid
-	dev-libs/rapidjson
-	dev-util/cmake
-	dev-util/gperf
-	media-libs/giflib
-	>=media-libs/libjpeg-turbo-2.0.4:=
-	>=media-libs/libpng-1.6.26:0=
-	test? ( >=dev-cpp/gtest-1.10.0 )
-	virtual/pkgconfig
-	virtual/jre
-	x86? ( dev-lang/nasm )
-"
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/platform/linux/*.cpp || die
-
-	# Prepare tools and libs witch are configured with autotools during compile time
-	AUTOTOOLS_DIRS=(
-		"${S}"/tools/depends/native/TexturePacker/src
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src
-	)
-
-	local d
-	for d in "${AUTOTOOLS_DIRS[@]}" ; do
-		pushd ${d} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
-		popd >/dev/null || die
-	done
-	elibtoolize
-
-	# Prevent autoreconf rerun
-	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
-		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
-		|| die
-}
-
-src_configure() {
-	local platform=()
-	use gbm && platform+=( gbm )
-	use wayland && platform+=( wayland )
-	use X && platform+=( x11 )
-	local core_platform_name="${platform[@]}"
-	local mycmakeargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AIRTUNES=$(usex airplay)
-		-DENABLE_AVAHI=$(usex zeroconf)
-		-DENABLE_BLUETOOTH=$(usex bluetooth)
-		-DENABLE_BLURAY=$(usex bluray)
-		-DENABLE_CCACHE=OFF
-		-DENABLE_CEC=$(usex cec)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DVDCSS=$(usex css)
-		-DENABLE_INTERNAL_CROSSGUID=OFF
-		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
-		-DENABLE_INTERNAL_FSTRCMP=OFF
-		-DENABLE_INTERNAL_GTEST=OFF
-		-DENABLE_INTERNAL_UDFREAD=OFF
-		-DENABLE_CAP=$(usex caps)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRCCLIENT=$(usex lirc)
-		-DENABLE_MARIADBCLIENT=$(usex mariadb)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_TESTING=$(usex test)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UDFREAD=$(usex udf)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DAPP_RENDER_SYSTEM="$(usex opengl gl gles)"
-		-DCORE_PLATFORM_NAME="${core_platform_name}"
-	)
-
-	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
-	if use system-ffmpeg; then
-		mycmakeargs+=( -DWITH_FFMPEG="yes" )
-	else
-		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile all
-}
-
-src_test() {
-	# see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
-	KODI_HOME="${BUILD_DIR}" cmake_build check
-}
-
-src_install() {
-	cmake_src_install
-
-	pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
-	newicon media/icon48x48.png kodi.png
-
-	rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
-	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
-		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-19.0_rc1.ebuild b/media-tv/kodi/kodi-19.0_rc1-r2.ebuild
similarity index 85%
rename from media-tv/kodi/kodi-19.0_rc1.ebuild
rename to media-tv/kodi/kodi-19.0_rc1-r2.ebuild
index 66f919ae8d5d..68d594537b69 100644
--- a/media-tv/kodi/kodi-19.0_rc1.ebuild
+++ b/media-tv/kodi/kodi-19.0_rc1-r2.ebuild
@@ -10,7 +10,7 @@ LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
 FFMPEG_VERSION="4.3.1"
 CODENAME="Matrix"
 FFMPEG_KODI_VERSION="Beta1"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
@@ -39,7 +39,8 @@ SLOT="0"
 # use flag is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+IUSE="airplay alsa bluetooth bluray caps cdio cec +css dav1d dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+IUSE="${IUSE} cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( gles opengl )
@@ -49,6 +50,7 @@ REQUIRED_USE="
 	udev? ( !libusb )
 	udisks? ( dbus )
 	upower? ( dbus )
+	power-control? ( dbus )
 "
 RESTRICT="!test? ( test )"
 
@@ -77,7 +79,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
 		dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
 	')
-	>=dev-libs/libcdio-2.1.0
+	cdio? ( >=dev-libs/libcdio-2.1.0 )
 	>=dev-libs/libfmt-6.1.2
 	dev-libs/libfstrcmp
 	gbm? (	media-libs/mesa[gbm] )
@@ -88,17 +90,17 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	libusb? ( virtual/libusb:1 )
 	virtual/ttf-fonts
 	media-fonts/roboto
-	media-libs/dav1d
 	>=media-libs/fontconfig-2.13.1
 	>=media-libs/freetype-2.10.1
 	>=media-libs/libass-0.13.4
 	!raspberry-pi? ( media-libs/mesa[egl] )
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d,encode,postproc]
+		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc]
 		libressl? ( media-video/ffmpeg[libressl,-openssl] )
 		!libressl? ( media-video/ffmpeg[-libressl,openssl] )
 	)
+	!system-ffmpeg? ( dav1d? ( media-libs/dav1d ) )
 	mysql? ( dev-db/mysql-connector-c:= )
 	mariadb? ( dev-db/mariadb-connector-c:= )
 	>=net-misc/curl-7.68.0[http2]
@@ -147,6 +149,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 "
 RDEPEND="${COMMON_DEPEND}
 	lirc? ( app-misc/lirc )
+	power-control? ( || ( sys-apps/systemd sys-auth/elogind ) )
 	udisks? ( sys-fs/udisks:2 )
 	upower? ( sys-power/upower )
 "
@@ -222,7 +225,16 @@ src_configure() {
 	use X && platform+=( x11 )
 	local core_platform_name="${platform[@]}"
 	local mycmakeargs=(
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2)
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon)
 		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DVERBOSE=ON
 		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
 		-DENABLE_ALSA=$(usex alsa)
 		-DENABLE_AIRTUNES=$(usex airplay)
@@ -230,18 +242,25 @@ src_configure() {
 		-DENABLE_BLUETOOTH=$(usex bluetooth)
 		-DENABLE_BLURAY=$(usex bluray)
 		-DENABLE_CCACHE=OFF
+		-DENABLE_ISO9660PP=$(usex cdio)
 		-DENABLE_CEC=$(usex cec)
 		-DENABLE_DBUS=$(usex dbus)
 		-DENABLE_DVDCSS=$(usex css)
 		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_RapidJSON=OFF
+		-DENABLE_INTERNAL_FMT=OFF
 		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
 		-DENABLE_INTERNAL_FSTRCMP=OFF
+		-DENABLE_INTERNAL_FLATBUFFERS=OFF
+		-DENABLE_INTERNAL_DAV1D=OFF
 		-DENABLE_INTERNAL_GTEST=OFF
 		-DENABLE_INTERNAL_UDFREAD=OFF
+		-DENABLE_INTERNAL_SPDLOG=OFF
 		-DENABLE_CAP=$(usex caps)
 		-DENABLE_LCMS2=$(usex lcms)
 		-DENABLE_LIRCCLIENT=$(usex lirc)
 		-DENABLE_MARIADBCLIENT=$(usex mariadb)
+		-DENABLE_MDNS=OFF # used only on Android
 		-DENABLE_MICROHTTPD=$(usex webserver)
 		-DENABLE_MYSQLCLIENT=$(usex mysql)
 		-DENABLE_NFS=$(usex nfs)
@@ -251,6 +270,7 @@ src_configure() {
 		-DENABLE_PLIST=$(usex airplay)
 		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
 		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_SNDIO=OFF
 		-DENABLE_TESTING=$(usex test)
 		-DENABLE_UDEV=$(usex udev)
 		-DENABLE_UDFREAD=$(usex udf)
@@ -275,6 +295,11 @@ src_configure() {
 		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
 	fi
 
+	if ! echo "${CFLAGS}" | grep -Fwqe '-DNDEBUG' - && ! echo "${CFLAGS}" | grep -Fwqe '-D_DEBUG' - ; then
+		CFLAGS+=' -DNDEBUG' # Kodi requires one of the 'NDEBUG' or '_DEBUG' defines
+		CXXFLAGS+=' -DNDEBUG'
+	fi
+
 	cmake_src_configure
 }
 
diff --git a/media-tv/kodi/kodi-19.9999.ebuild b/media-tv/kodi/kodi-19.9999.ebuild
index 66f919ae8d5d..68d594537b69 100644
--- a/media-tv/kodi/kodi-19.9999.ebuild
+++ b/media-tv/kodi/kodi-19.9999.ebuild
@@ -10,7 +10,7 @@ LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
 FFMPEG_VERSION="4.3.1"
 CODENAME="Matrix"
 FFMPEG_KODI_VERSION="Beta1"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
@@ -39,7 +39,8 @@ SLOT="0"
 # use flag is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+IUSE="airplay alsa bluetooth bluray caps cdio cec +css dav1d dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+IUSE="${IUSE} cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( gles opengl )
@@ -49,6 +50,7 @@ REQUIRED_USE="
 	udev? ( !libusb )
 	udisks? ( dbus )
 	upower? ( dbus )
+	power-control? ( dbus )
 "
 RESTRICT="!test? ( test )"
 
@@ -77,7 +79,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
 		dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
 	')
-	>=dev-libs/libcdio-2.1.0
+	cdio? ( >=dev-libs/libcdio-2.1.0 )
 	>=dev-libs/libfmt-6.1.2
 	dev-libs/libfstrcmp
 	gbm? (	media-libs/mesa[gbm] )
@@ -88,17 +90,17 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	libusb? ( virtual/libusb:1 )
 	virtual/ttf-fonts
 	media-fonts/roboto
-	media-libs/dav1d
 	>=media-libs/fontconfig-2.13.1
 	>=media-libs/freetype-2.10.1
 	>=media-libs/libass-0.13.4
 	!raspberry-pi? ( media-libs/mesa[egl] )
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d,encode,postproc]
+		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc]
 		libressl? ( media-video/ffmpeg[libressl,-openssl] )
 		!libressl? ( media-video/ffmpeg[-libressl,openssl] )
 	)
+	!system-ffmpeg? ( dav1d? ( media-libs/dav1d ) )
 	mysql? ( dev-db/mysql-connector-c:= )
 	mariadb? ( dev-db/mariadb-connector-c:= )
 	>=net-misc/curl-7.68.0[http2]
@@ -147,6 +149,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 "
 RDEPEND="${COMMON_DEPEND}
 	lirc? ( app-misc/lirc )
+	power-control? ( || ( sys-apps/systemd sys-auth/elogind ) )
 	udisks? ( sys-fs/udisks:2 )
 	upower? ( sys-power/upower )
 "
@@ -222,7 +225,16 @@ src_configure() {
 	use X && platform+=( x11 )
 	local core_platform_name="${platform[@]}"
 	local mycmakeargs=(
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2)
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon)
 		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DVERBOSE=ON
 		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
 		-DENABLE_ALSA=$(usex alsa)
 		-DENABLE_AIRTUNES=$(usex airplay)
@@ -230,18 +242,25 @@ src_configure() {
 		-DENABLE_BLUETOOTH=$(usex bluetooth)
 		-DENABLE_BLURAY=$(usex bluray)
 		-DENABLE_CCACHE=OFF
+		-DENABLE_ISO9660PP=$(usex cdio)
 		-DENABLE_CEC=$(usex cec)
 		-DENABLE_DBUS=$(usex dbus)
 		-DENABLE_DVDCSS=$(usex css)
 		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_RapidJSON=OFF
+		-DENABLE_INTERNAL_FMT=OFF
 		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
 		-DENABLE_INTERNAL_FSTRCMP=OFF
+		-DENABLE_INTERNAL_FLATBUFFERS=OFF
+		-DENABLE_INTERNAL_DAV1D=OFF
 		-DENABLE_INTERNAL_GTEST=OFF
 		-DENABLE_INTERNAL_UDFREAD=OFF
+		-DENABLE_INTERNAL_SPDLOG=OFF
 		-DENABLE_CAP=$(usex caps)
 		-DENABLE_LCMS2=$(usex lcms)
 		-DENABLE_LIRCCLIENT=$(usex lirc)
 		-DENABLE_MARIADBCLIENT=$(usex mariadb)
+		-DENABLE_MDNS=OFF # used only on Android
 		-DENABLE_MICROHTTPD=$(usex webserver)
 		-DENABLE_MYSQLCLIENT=$(usex mysql)
 		-DENABLE_NFS=$(usex nfs)
@@ -251,6 +270,7 @@ src_configure() {
 		-DENABLE_PLIST=$(usex airplay)
 		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
 		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_SNDIO=OFF
 		-DENABLE_TESTING=$(usex test)
 		-DENABLE_UDEV=$(usex udev)
 		-DENABLE_UDFREAD=$(usex udf)
@@ -275,6 +295,11 @@ src_configure() {
 		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
 	fi
 
+	if ! echo "${CFLAGS}" | grep -Fwqe '-DNDEBUG' - && ! echo "${CFLAGS}" | grep -Fwqe '-D_DEBUG' - ; then
+		CFLAGS+=' -DNDEBUG' # Kodi requires one of the 'NDEBUG' or '_DEBUG' defines
+		CXXFLAGS+=' -DNDEBUG'
+	fi
+
 	cmake_src_configure
 }
 
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 66f919ae8d5d..68d594537b69 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -10,7 +10,7 @@ LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
 FFMPEG_VERSION="4.3.1"
 CODENAME="Matrix"
 FFMPEG_KODI_VERSION="Beta1"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
@@ -39,7 +39,8 @@ SLOT="0"
 # use flag is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+IUSE="airplay alsa bluetooth bluray caps cdio cec +css dav1d dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+IUSE="${IUSE} cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( gles opengl )
@@ -49,6 +50,7 @@ REQUIRED_USE="
 	udev? ( !libusb )
 	udisks? ( dbus )
 	upower? ( dbus )
+	power-control? ( dbus )
 "
 RESTRICT="!test? ( test )"
 
@@ -77,7 +79,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
 		dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
 	')
-	>=dev-libs/libcdio-2.1.0
+	cdio? ( >=dev-libs/libcdio-2.1.0 )
 	>=dev-libs/libfmt-6.1.2
 	dev-libs/libfstrcmp
 	gbm? (	media-libs/mesa[gbm] )
@@ -88,17 +90,17 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	libusb? ( virtual/libusb:1 )
 	virtual/ttf-fonts
 	media-fonts/roboto
-	media-libs/dav1d
 	>=media-libs/fontconfig-2.13.1
 	>=media-libs/freetype-2.10.1
 	>=media-libs/libass-0.13.4
 	!raspberry-pi? ( media-libs/mesa[egl] )
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d,encode,postproc]
+		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc]
 		libressl? ( media-video/ffmpeg[libressl,-openssl] )
 		!libressl? ( media-video/ffmpeg[-libressl,openssl] )
 	)
+	!system-ffmpeg? ( dav1d? ( media-libs/dav1d ) )
 	mysql? ( dev-db/mysql-connector-c:= )
 	mariadb? ( dev-db/mariadb-connector-c:= )
 	>=net-misc/curl-7.68.0[http2]
@@ -147,6 +149,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 "
 RDEPEND="${COMMON_DEPEND}
 	lirc? ( app-misc/lirc )
+	power-control? ( || ( sys-apps/systemd sys-auth/elogind ) )
 	udisks? ( sys-fs/udisks:2 )
 	upower? ( sys-power/upower )
 "
@@ -222,7 +225,16 @@ src_configure() {
 	use X && platform+=( x11 )
 	local core_platform_name="${platform[@]}"
 	local mycmakeargs=(
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2)
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon)
 		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DVERBOSE=ON
 		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
 		-DENABLE_ALSA=$(usex alsa)
 		-DENABLE_AIRTUNES=$(usex airplay)
@@ -230,18 +242,25 @@ src_configure() {
 		-DENABLE_BLUETOOTH=$(usex bluetooth)
 		-DENABLE_BLURAY=$(usex bluray)
 		-DENABLE_CCACHE=OFF
+		-DENABLE_ISO9660PP=$(usex cdio)
 		-DENABLE_CEC=$(usex cec)
 		-DENABLE_DBUS=$(usex dbus)
 		-DENABLE_DVDCSS=$(usex css)
 		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_RapidJSON=OFF
+		-DENABLE_INTERNAL_FMT=OFF
 		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
 		-DENABLE_INTERNAL_FSTRCMP=OFF
+		-DENABLE_INTERNAL_FLATBUFFERS=OFF
+		-DENABLE_INTERNAL_DAV1D=OFF
 		-DENABLE_INTERNAL_GTEST=OFF
 		-DENABLE_INTERNAL_UDFREAD=OFF
+		-DENABLE_INTERNAL_SPDLOG=OFF
 		-DENABLE_CAP=$(usex caps)
 		-DENABLE_LCMS2=$(usex lcms)
 		-DENABLE_LIRCCLIENT=$(usex lirc)
 		-DENABLE_MARIADBCLIENT=$(usex mariadb)
+		-DENABLE_MDNS=OFF # used only on Android
 		-DENABLE_MICROHTTPD=$(usex webserver)
 		-DENABLE_MYSQLCLIENT=$(usex mysql)
 		-DENABLE_NFS=$(usex nfs)
@@ -251,6 +270,7 @@ src_configure() {
 		-DENABLE_PLIST=$(usex airplay)
 		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
 		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_SNDIO=OFF
 		-DENABLE_TESTING=$(usex test)
 		-DENABLE_UDEV=$(usex udev)
 		-DENABLE_UDFREAD=$(usex udf)
@@ -275,6 +295,11 @@ src_configure() {
 		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
 	fi
 
+	if ! echo "${CFLAGS}" | grep -Fwqe '-DNDEBUG' - && ! echo "${CFLAGS}" | grep -Fwqe '-D_DEBUG' - ; then
+		CFLAGS+=' -DNDEBUG' # Kodi requires one of the 'NDEBUG' or '_DEBUG' defines
+		CXXFLAGS+=' -DNDEBUG'
+	fi
+
 	cmake_src_configure
 }
 
diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml
index 1fa46eccbfd6..81a59deb4e93 100644
--- a/media-tv/kodi/metadata.xml
+++ b/media-tv/kodi/metadata.xml
@@ -8,13 +8,17 @@
 	<use>
 		<flag name="airplay">enable AirPlay support</flag>
 		<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
+		<flag name="caps">Use <pkg>sys-libs/libcap</pkg> to bind to privileged ports as non-root</flag>
+		<flag name="cdio">Enable reading of Audio-CD, Video-CD, and CD-ROM disks and images by <pkg>dev-libs/libcdio</pkg></flag>
 		<flag name="cec">Enable support for HDMI-CEC devices via libcec</flag>
 		<flag name="gbm">Use the Graphics Buffer Manager for EGL on KMS.</flag>
 		<flag name="gles">Enable support for GLES</flag>
-		<flag name="lirc">Enable support for controlling Totem with a remote control using <pkg>app-misc/lirc</pkg></flag>
+		<flag name="lirc">Enable support for IR remote controls using <pkg>app-misc/lirc</pkg></flag>
 		<flag name="mariadb">Add MariaDB support</flag>
+		<flag name="dav1d">Enables AV1 decoding via <pkg>media-libs/dav1d</pkg></flag>
 		<flag name="nfs">Enable NFS client support</flag>
 		<flag name="dvd">Enable optical (CD/DVD drive) support</flag>
+		<flag name="power-control">Enable control of shutdown, reboot, suspend, and hibernate</flag>
 		<flag name="raspberry-pi">Enable support for the Raspberry Pi</flag>
 		<flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag>
 		<flag name="libusb">Use <pkg>virtual/libusb</pkg> for usb device hotplug support. This flag should only be enabled if you're running a non-Linux kernel or you don't want to use <pkg>sys-fs/udev</pkg>.</flag>
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 1cf64325eb72..53d8f4346b56 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/google2srt/Manifest b/media-video/google2srt/Manifest
index 38e3bd74a07e..b581923f9438 100644
--- a/media-video/google2srt/Manifest
+++ b/media-video/google2srt/Manifest
@@ -1,5 +1,5 @@
 AUX build.xml 2320 BLAKE2B 48a205bd932f3781be640dab3c03f1a95503326259a7bdba7960abab4ec72d3b7ce13e39798ac7b2bf9ff751a5be1e49cba016e5634abb582a1f56555c1a030e SHA512 057368c9199a41d840b0326647e3a3aef70ddc1c3a286fb53e2d68a9baf3ebd82cc21299af5792d0f0fa0fba4abb399a02c781d83403683a54a895fa04167bf9
 DIST Google2SRT-0.5.6.zip 355167 BLAKE2B bb365ae01db8ca3eba67cfe01840a1e6da6034c86dac45a47c0164a72f9fbd958307ce545423a0c715f7ebefdae31d38686e9103d873d8cf98ecf99da579d143 SHA512 edb7b1ee4440f4962220557c794090edb9b3647a64deb70c19170bb4af3edbb5abc93ddd6061badf458c6cd92c17024b91bbdfa95bb1b366d1092b659db08094
 DIST google2srt-icon.png 1848 BLAKE2B 323ff2128b17ba6584f23869432575eeca87a0195867123193b9734cfb453d8483a79e14ba156e2b8168eb5d03c66795f6ae06d8cdb7c1e1aedcc28fbb593c79 SHA512 051d8ffe8488e2521cdfbfd045d6b5159a18619e12dc1216b1687514cf3f1cebdf2167af372c2ec46d3886412350f5872e8a8c245fee341a30fec51615b5140f
-EBUILD google2srt-0.5.6-r1.ebuild 1408 BLAKE2B da836bb6973757f0f5ba5a6eaefe5f130359b415ccd8fa9fad07bf69e7c8c4f7cff87e418cc85ad1afe0f730ba89754abb50941ee709dd98ab51de27ea106dcd SHA512 486331e74c0dea20650213e68c1611c9dd9705e5f586f03ab0d80388984a62369cc943bbdc60f4ea27abd9274c70b1bb6475462ad21968c651562afb10267fe7
+EBUILD google2srt-0.5.6-r1.ebuild 1422 BLAKE2B 1667d7fc5ea5cd096a75fd471c93a1afe27ae94a0193c73cecbd98561e773700b0e684110be272b4bca97ccb46f64e1f0db8288f3355ab86aeb5ed85a1720c7e SHA512 017014d1a5aca47e2874a6cb63d3b54d4917d9a7c46852f84979cb9229b9a1d4aae9d2bca79cb3b32f52181ccde85143374a8666c4ca492101f47cd3c7707d1d
 MISC metadata.xml 694 BLAKE2B d69441282b20831b45a0599327fb8c9169f5eb15fb83c035e581d409840ae18ca3740b964cda8cd620ff1e4c664d851fe3f8a4a15e0747d5bc6403544231536b SHA512 1bb8f8d9e54b9ba4199ec8f92e4a01838ce08cc2c2cda8c1758681932032ba141b57021c7f078bd21f9205a156434c6f29553a2d5279efb476dd9bf52164eb86
diff --git a/media-video/google2srt/google2srt-0.5.6-r1.ebuild b/media-video/google2srt/google2srt-0.5.6-r1.ebuild
index 3c4143460253..4e228dc166a4 100644
--- a/media-video/google2srt/google2srt-0.5.6-r1.ebuild
+++ b/media-video/google2srt/google2srt-0.5.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,8 +25,9 @@ COMMON_DEP="dev-java/jdom:0"
 
 RDEPEND=">=virtual/jre-1.6
 	${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.6
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.6
 	${COMMON_DEP}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-video/rav1e/Manifest b/media-video/rav1e/Manifest
index 47dbbc56d9d7..c8dd68a3bfb9 100644
--- a/media-video/rav1e/Manifest
+++ b/media-video/rav1e/Manifest
@@ -348,7 +348,7 @@ DIST y4m-0.5.3.crate 11447 BLAKE2B d3a7081899f12a50907ecbce6f63f1b1119618aefdc97
 DIST y4m-0.7.0.crate 12045 BLAKE2B 4f48eb7ad5be2486e0f723b9beb9109cd1b38a0d0c5ac4a64411fce0bd9371d45496e5e0e839d15e7d1616b3888cfc1a0fc1ca364e65ac508306cad9a4ed44a7 SHA512 b85b0dd6df46c9bf125eee3e51ea39545ea1c794a2a097bba0aa31c682532ed3a9ba141745c61915fff13535fc5fff5a490d7c9e731c75bb5ce38a702075467e
 EBUILD rav1e-0.3.3.ebuild 4153 BLAKE2B 96f69c97721839eb9eaf7249780a50c95f3eaf7acc59d405cc618a8502bcfc480f93faa7518fb38a4e75fbeb1a1b09f910917dd1123de0b1cd8b7f2ec972f194 SHA512 dfdeccc66fba51e839cacc73c6c6502b86c30d6e7e771e186f7803cc5e82633858b2dba88b7baf73fa144ede00e1dc96a7f02314d286b05be11c9a92bf0efbf7
 EBUILD rav1e-0.3.4.ebuild 4204 BLAKE2B 7ac7a8f83ba51e84e3af9efb10e7d933af07f98089ac5083fb6583c8d8500d8923a6616e9ae4be8b4250eae7ce5c9fdf63617ca4dae29cac6849510fb0864d1f SHA512 103e3bd77c98ce7ded5d4c2aaa242b0e2acf239c248a0f6e3e7fd27f76faabce48992a70726ed332b108a8e28472b7bde41e1d73713ab49ad692610e3c1ede8b
-EBUILD rav1e-0.3.5.ebuild 4223 BLAKE2B dec1317c98d21406960561e66c46af2716adc2ffd2c1899914e12b3b11d418008a6d63903f251e1564ae65447e467791019437ff75a5afb41e3a56090bcac2e7 SHA512 d0de582dff51c14d43b8f70b46df93933107e5922b3b42d2174f0dae3d7c1ced52c20dca664794ae8124a74a66b51824bcaf42e7a29d6bfb07dae1974cf1218d
+EBUILD rav1e-0.3.5.ebuild 4221 BLAKE2B 0e763c215bbaac1a5549a72c483fe3990cdd6091442ae8ebf552e6e30c48647ae433b2573ef8730cd3c2e0ee3fb7867d07ea1057827247123f90dc5cd57ee2c6 SHA512 3da57216cb0a81c7105ae28cb26afe5a4c8bcf7b854dc55b890cf0368323d67b08a2d11ed51fb493b54f59917736532940298743240973cd77da06307cc4164b
 EBUILD rav1e-0.4.0.ebuild 4473 BLAKE2B cd09adfd6b818c15f7b235eeb8670e177e2861ece3789e4bcee2fdd1659194fdb8484dcf977b70dc9af9dd9fdd6d4b4844f3297050a331b4cc00de63872e1e41 SHA512 f46d6913e2475f2cc08f78437bee00609cfe766017337f6b49ce95bae353644373efa79a2f9eb7b193cbf36d458a382c36d78e142a0162e3540a9ea649c46c26
 EBUILD rav1e-9999.ebuild 1361 BLAKE2B 8eaf63b69c5eef56c0e7fb725aea974e688da362dec3cfe1bac18562f281102e0f4430c1dd612c66425e60d7146b2b8e5504717229cd19e260834c2d2bd6e74b SHA512 e0f16779f8646fe7f283a5f0a07b3374aa5db1f31155637780a0dc3d25148664373e92907e27d4a1259e063d7a392c8a9e320a21bf05c4bbc4fe756fa5b8d1c9
 MISC metadata.xml 396 BLAKE2B 3f15123aeeca6df02c1b6a886418af6cfd4e4e977a5a93b2cc13301ae8e5a17a918a9e8116e19ae120cc27e42bcdaeb5e6c546f99b0333144bbc4aa9960b862e SHA512 4d650221196a5f48b12f2dcd6ccd3ea56abc7ec205e78d470aae267c7706cf81f03a691ca916d5c2a8c9e09a62c07b0802b5c688bc60bbc09d74ea7a135278ed
diff --git a/media-video/rav1e/rav1e-0.3.5.ebuild b/media-video/rav1e/rav1e-0.3.5.ebuild
index 782603cdb78e..07ad2c2ffe7d 100644
--- a/media-video/rav1e/rav1e-0.3.5.ebuild
+++ b/media-video/rav1e/rav1e-0.3.5.ebuild
@@ -181,7 +181,7 @@ else
 		https://github.com/xiph/rav1e/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		$(cargo_crate_uris ${CRATES})
 		"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
 fi
 
 DESCRIPTION="The fastest and safest AV1 encoder"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index c25fbd07606f..9aeb8a820b91 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index c99e3d09773c..c1cf5c28dd4e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Feb 2021 11:08:24 +0000
+Tue, 02 Feb 2021 06:08:27 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 1623bdd4a417..ae906523a12d 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 500540 BLAKE2B 7a48959b9c07be5fc6e9e98ffbda2d71400bbd137c089df45f7701ae5dd1ba444366d51af5a4656f0a37ca0bbed5e1b74627c57cf425e57c4516bb7194b7dc59 SHA512 e923ed887d7140a57ff660001f6646dac898bdcaefc8ab2effe01101b80e6b709f7e4d00bf72e6d181aa41f6d99fe7b4285de0597a1b60734104a3eee41ee946
-TIMESTAMP 2021-02-01T11:08:27Z
+TIMESTAMP 2021-02-02T06:08:30Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmAX4StfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmAY7F5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCZfg//dzpBh5nRN9NDySyOU3lTQOiY5JuyvlRICpYWPZCSxj1f8MoVuKKcSaiz
-oBYUlyTDJbkjJZmrC0MdXPzoAlGmWzJXZ2UnD1VEpHAhQyXHvD4t+boM/s+uuxW1
-ojKwSqpKSQowlk2my9DT/fFq3xc9L/2k2XAw50JofptKFtTyZntUO8Fn0Nc+4wbu
-CmwEVgTgJrRm50wer8L6OQKuSH9oFwhME256iU/cdUy83sG5YGmjySc7Xa+Hy/hR
-ksMfrZBovf4glM8F4mylDl44JwxcdNZgErEKVqq8xkfuwIsSiBU7K4c2sOF912d7
-JLyZZ0qyFlxS9Vr5dTDRNVdpVQD0f0bEwVxs92+z3/gnBMcoFcAtPcFrB2PQWhpq
-GRiJwdnimZt6mfXHmfgQT3KtKalZAlNwos3I5W+6lX8iQpp7eymnmGLV1DeJxFkD
-amDeOYivTRo7mTS4tUw81dEASVPki6sxzgviEXW/Ggt46eqNIY9SfkkEDLrQtYCq
-HqaG+uE4ZAH9PROO7QzbWd6NLKjirI73AbxD3kYxSwms6ncpD29J/Vk3TutD87Gi
-rzaK0oeAdciHvC7oM7Gvr/LTQ8njXxZfRCUvkwvIpYJsDPcnONUG2Qd2QG2uKP7w
-JmyYca+I0bz70ko0PAIudoM+ndKNFn03wsyb2EUT8MpL/MAOEF8=
-=T0gq
+klDFWA/8D4rMP3Ssz2Xb4S0K6KRV2GZ3Pd0HFf3IFngCJKplrSGB3sqVaILWqJQr
+3Clc+qcLYLR+oXLKXHZTLJvGhRCah2w3Y9ToFm/IhdGJ2njuuljnJ1iSMSQ5ZpAO
+/+Y2D2QtX7j1yKV1+Tv8+fD+of5pURciu+x6UCLOtVlW0GpD8ehij10u+OYtna6B
+bXEncbDyr67em2j0LAG+iLCclH509vneAw/1s2XU+W4EiJ8Gv4C4S2+vwLZyJQ1F
+Ys4FoK0SmYot4cSIvLaBvuQBjgFOsnAmSBJzl/Ib9/Kl8Y87t11yYIOQ2blElURu
+98yXy9lDbwBNA9VK7ndhXqEJq2mVrKZ7hrrtUFN1+M8ExqLxasOav8NSfoxEiXrZ
+ImbYLYhYDNJNUZJazBXfxT6JKeK9rdr0sUlnspSPSPKobHIYR0f4oP3SSs0G8emC
+Yi6HucLl0RtweyC6Ry2OELjo3zT+TTR+lrlSKRq75xfqjgehJwslri2p3WFcE2Gt
+mjNXv42Ei702KDfaS17qAawy4XTz0j92GSGPsx+a1mp1ABIPNbCLxd3Of1v63N4N
+6JOiGjrN/HOELYg3l/LhL4HOsq/iIHuHguhzq0FQCxb/laApBR1+3/Cxw3nkym+L
+5Hijp6QkxqsQAtblUwXCTsznQQb5d+q/4TF0Dim63AqWe4XXEnQ=
+=Sk5s
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index c99e3d09773c..c1cf5c28dd4e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Feb 2021 11:08:24 +0000
+Tue, 02 Feb 2021 06:08:27 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 55407565547b..426dda450e6d 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 875a3a65db75..d6d1dcaed5ff 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/doctl-1.55.0 b/metadata/md5-cache/app-admin/doctl-1.55.0
new file mode 100644
index 000000000000..7abadab99dbe
--- /dev/null
+++ b/metadata/md5-cache/app-admin/doctl-1.55.0
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst test unpack
+DESCRIPTION=A command line tool for DigitalOcean services
+EAPI=7
+HOMEPAGE=https://github.com/digitalocean/doctl
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/digitalocean/doctl/archive/v1.55.0.tar.gz -> doctl-1.55.0.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1c0ec03ce0941f102ad0c09db91fd4d6
diff --git a/metadata/md5-cache/app-admin/doctl-9999 b/metadata/md5-cache/app-admin/doctl-9999
new file mode 100644
index 000000000000..1c019e485231
--- /dev/null
+++ b/metadata/md5-cache/app-admin/doctl-9999
@@ -0,0 +1,11 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst test unpack
+DESCRIPTION=A command line tool for DigitalOcean services
+EAPI=7
+HOMEPAGE=https://github.com/digitalocean/doctl
+LICENSE=Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0
+PROPERTIES=live
+RESTRICT=strip
+SLOT=0
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	git-r3	3e7ec3d6619213460c85e2aa48398441	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=729acd4fa4083273d53f5bf9afc91001
diff --git a/metadata/md5-cache/app-admin/newsyslog-1.1.0.81-r1 b/metadata/md5-cache/app-admin/newsyslog-1.1.0.81-r1
index e9e1c1e1c45e..5998ba0270ce 100644
--- a/metadata/md5-cache/app-admin/newsyslog-1.1.0.81-r1
+++ b/metadata/md5-cache/app-admin/newsyslog-1.1.0.81-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=configure install
 DESCRIPTION=a highly configurable program for managing and archiving log files
 EAPI=7
 HOMEPAGE=http://www.weird.com/~woods/projects/newsyslog.html
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=virtual/cron app-arch/gzip
 SLOT=0
 SRC_URI=http://download.openpkg.org/components/cache/newsyslog/newsyslog-1.1.0.81.tar.gz
-_md5_=f9f291ff0b0e53a975acd626ba674002
+_md5_=cad73dc96608cbb5bcef61034c4e6e5a
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index c66fa665ce91..0a3181f26117 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/libmd-1.0.3 b/metadata/md5-cache/app-crypt/libmd-1.0.3
index 2173405ee001..2f5565102d11 100644
--- a/metadata/md5-cache/app-crypt/libmd-1.0.3
+++ b/metadata/md5-cache/app-crypt/libmd-1.0.3
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Message Digest functions from BSD systems
 EAPI=7
 HOMEPAGE=https://www.hadrons.org/software/libmd/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
 SLOT=0
 SRC_URI=https://archive.hadrons.org/software/libmd/libmd-1.0.3.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f5b30385d096484e8349e5b14d17d77f
+_md5_=2fbfebcb07fe21047bebefaf6b2382aa
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 75f5d12371ce..992fd0186d8a 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/okteta-0.26.5 b/metadata/md5-cache/app-editors/okteta-0.26.5
new file mode 100644
index 000000000000..5d66adc1fcfb
--- /dev/null
+++ b/metadata/md5-cache/app-editors/okteta-0.26.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtscript-5.15.2:5[scripttools] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 crypt? ( >=app-crypt/qca-2.3.0:2 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Hex editor by KDE
+EAPI=7
+HOMEPAGE=https://apps.kde.org/en/okteta https://utils.kde.org/projects/okteta/
+IUSE=crypt test debug designer +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2 handbook? ( FDL-1.2 )
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtscript-5.15.2:5[scripttools] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 crypt? ( >=app-crypt/qca-2.3.0:2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/okteta/0.26.5/src/okteta-0.26.5.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	8a81008797ecdb979e3100d782ab5513	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=79f83342e769f471ec5bb8a603884f1b
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 3e3b461a04e9..de3c7f6df47e 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/qemu-5.2.0-r2 b/metadata/md5-cache/app-emulation/qemu-5.2.0-r2
index f27ad232b96f..61f0e2b94c8c 100644
--- a/metadata/md5-cache/app-emulation/qemu-5.2.0-r2
+++ b/metadata/md5-cache/app-emulation/qemu-5.2.0-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-5.2.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=192358f217913f3a1cd55df50aece4bb
+_md5_=570502bc9269c1f455a5cc68ab859cfa
diff --git a/metadata/md5-cache/app-emulation/xen-4.13.2-r4 b/metadata/md5-cache/app-emulation/xen-4.13.2-r4
new file mode 100644
index 000000000000..cb2ba012e723
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.13.2-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
+DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=debug efi flask
+KEYWORDS=~amd64 ~arm -x86
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.13.2
+REQUIRED_USE=arm? ( debug )
+RESTRICT=test splitdebug strip
+SLOT=0
+SRC_URI=https://downloads.xenproject.org/release/xen/4.13.2/xen-4.13.2.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.13.2-upstream-patches-3.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.13.2-upstream-patches-3.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1c6e5ff68f2b14bbb7d8655c6b0b793f
diff --git a/metadata/md5-cache/app-emulation/xen-4.14.1 b/metadata/md5-cache/app-emulation/xen-4.14.1
new file mode 100644
index 000000000000..b22d4929279c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.14.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
+DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=debug efi flask
+KEYWORDS=~amd64 ~arm -x86
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.14.1
+REQUIRED_USE=arm? ( debug )
+RESTRICT=test splitdebug strip
+SLOT=0
+SRC_URI=https://downloads.xenproject.org/release/xen/4.14.1/xen-4.14.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=98c9e286208ed4892b8a7150616f181c
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.14.1 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.14.1
new file mode 100644
index 000000000000..cb605bf93013
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-pvgrub-4.14.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=sys-devel/gettext sys-devel/bin86 sys-apps/texinfo x11-libs/pixman
+DESCRIPTION=allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-emulation/xen-tools-4.14.1
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://downloads.xenproject.org/release/xen/4.14.1/xen-4.14.1.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz http://xenbits.xensource.com/xen-extfiles/polarssl-1.1.4-gpl.tgz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=fe864bca395f135fbff047f5a3f41b28
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.14.1 b/metadata/md5-cache/app-emulation/xen-tools-4.14.1
new file mode 100644
index 000000000000..6f5b9af3625b
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.14.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_7? ( dev-lang/python:3.7[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-misc/pax-utils dev-lang/perl >=sys-kernel/linux-headers-4.11 x11-libs/pixman python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] pam? ( dev-python/pypam[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] pam? ( dev-python/pypam[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] pam? ( dev-python/pypam[python_targets_python3_9(-)] ) ) x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) doc? ( app-text/ghostscript-gpl app-text/pandoc python_single_target_python3_7? ( dev-python/markdown[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/markdown[python_targets_python3_9(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) python? ( >=dev-lang/swig-4.0.0 )
+DESCRIPTION=Xen tools including QEMU and xl
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_7? ( dev-lang/python:3.7[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
+RESTRICT=test
+SLOT=0/4.14
+SRC_URI=https://downloads.xenproject.org/release/xen/4.14.1/xen-4.14.1.tar.gz https://github.com/qemu/seabios/archive/rel-1.13.0.tar.gz -> seabios-1.13.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/06dc822d045c2bb42e497487935485302486e151.tar.gz -> edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-22.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-22.tar.xz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b68d19c32f9b211812c04ac8bf64efb0
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index ed4c93a17110..ca0e7ba11df4 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/dblatex-0.3.11-r1 b/metadata/md5-cache/app-text/dblatex-0.3.11-r1
index 4088651b4927..2422bf983596 100644
--- a/metadata/md5-cache/app-text/dblatex-0.3.11-r1
+++ b/metadata/md5-cache/app-text/dblatex-0.3.11-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Transform DocBook using TeX macros
 EAPI=7
 HOMEPAGE=http://dblatex.sourceforge.net/
 IUSE=inkscape python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs/libxslt dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-xetex gnome-base/librsvg media-gfx/imagemagick media-gfx/transfig inkscape? ( media-gfx/inkscape ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/dblatex/dblatex/dblatex-0.3.11/dblatex-0.3.11py3.tar.bz2
 _eclasses_=distutils-r1	5363e4936a5e855108ec3fd191bd2b3c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=41689b7a0ebedf048ba257c86def18a6
+_md5_=5cfd1d62a0629db870016c1dc2c051c7
diff --git a/metadata/md5-cache/app-text/libnumbertext-1.0.7 b/metadata/md5-cache/app-text/libnumbertext-1.0.7
new file mode 100644
index 000000000000..9085cde3c543
--- /dev/null
+++ b/metadata/md5-cache/app-text/libnumbertext-1.0.7
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Number to number name and money text conversion libraries
+EAPI=7
+HOMEPAGE=https://github.com/Numbertext/libnumbertext
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3+
+SLOT=0
+SRC_URI=https://github.com/Numbertext/libnumbertext/releases/download/1.0.7/libnumbertext-1.0.7.tar.xz
+_md5_=466e9ddc7fa62c8efdafbac7ab7794a0
diff --git a/metadata/md5-cache/app-text/poppler-21.02.0 b/metadata/md5-cache/app-text/poppler-21.02.0
new file mode 100644
index 000000000000..8fb237de68f7
--- /dev/null
+++ b/metadata/md5-cache/app-text/poppler-21.02.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 )
+DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
+EAPI=7
+HOMEPAGE=https://poppler.freedesktop.org/
+IUSE=cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
+RESTRICT=test
+SLOT=0/107
+SRC_URI=https://poppler.freedesktop.org/poppler-21.02.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3815b27b2006b936506562474cfd2efd
diff --git a/metadata/md5-cache/app-text/poppler-9999 b/metadata/md5-cache/app-text/poppler-9999
index 88e6b6b1b762..dfdece4796f5 100644
--- a/metadata/md5-cache/app-text/poppler-9999
+++ b/metadata/md5-cache/app-text/poppler-9999
@@ -11,4 +11,4 @@ RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-lib
 RESTRICT=test
 SLOT=0/9999
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b3c07149ac126e59246091bbc0ab1b6c
+_md5_=3815b27b2006b936506562474cfd2efd
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 67386e0f91a4..8c170745aa4c 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/sqlcl-bin-20.3.0.274.1916 b/metadata/md5-cache/dev-db/sqlcl-bin-20.4.1.351.1718
similarity index 88%
rename from metadata/md5-cache/dev-db/sqlcl-bin-20.3.0.274.1916
rename to metadata/md5-cache/dev-db/sqlcl-bin-20.4.1.351.1718
index 70c832b43e94..1feee77cd1bd 100644
--- a/metadata/md5-cache/dev-db/sqlcl-bin-20.3.0.274.1916
+++ b/metadata/md5-cache/dev-db/sqlcl-bin-20.4.1.351.1718
@@ -10,6 +10,6 @@ LICENSE=OTN
 RDEPEND=dev-db/oracle-instantclient dev-java/java-config:2 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 RESTRICT=bindist fetch mirror
 SLOT=0
-SRC_URI=sqlcl-20.3.0.274.1916.zip
+SRC_URI=sqlcl-20.4.1.351.1718.zip
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
-_md5_=e3df8711f472e7c552ebb46c501c670b
+_md5_=6c4bc970985f16294d6161f07d433cab
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index a3fa665c6d5c..8b64c7d88796 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r4 b/metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r4
index b68cce2e90c6..0ed4205b2bcb 100644
--- a/metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r4
+++ b/metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r4
@@ -5,11 +5,11 @@ DESCRIPTION=Provides a C++ API for D-BUS
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/dbus-cplusplus/ https://sourceforge.net/apps/mediawiki/dbus-cplusplus/index.php?title=Main_Page
 IUSE=doc ecore glib test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ecore? ( dev-libs/efl ) glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/dbus-cplusplus/libdbus-c++-0.9.0.tar.gz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f1c57ea68f87a30111c69d48b3b90ddb
+_md5_=cff6a3c19908ee105584830d11aef866
diff --git a/metadata/md5-cache/dev-libs/granite-5.2.5-r1 b/metadata/md5-cache/dev-libs/granite-5.2.5-r1
index bf7cd6867d57..248feea076e8 100644
--- a/metadata/md5-cache/dev-libs/granite-5.2.5-r1
+++ b/metadata/md5-cache/dev-libs/granite-5.2.5-r1
@@ -1,15 +1,15 @@
-BDEPEND=|| ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) virtual/pkgconfig doc? ( dev-lang/vala[valadoc] dev-util/gtk-doc ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=|| ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) virtual/pkgconfig doc? ( >=dev-lang/vala-0.40.20[valadoc] dev-util/gtk-doc ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.50:2 dev-libs/libgee:0.8[introspection=] >=x11-libs/gtk+-3.22:3[introspection=] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.50:2 dev-libs/libgee:0.8[introspection] >=x11-libs/gtk+-3.22:3[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Elementary OS library that extends GTK+
 EAPI=7
 HOMEPAGE=https://github.com/elementary/granite
-IUSE=doc +introspection test
+IUSE=doc test
 KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-3+
-RDEPEND=>=dev-libs/glib-2.50:2 dev-libs/libgee:0.8[introspection=] >=x11-libs/gtk+-3.22:3[introspection=]
+RDEPEND=>=dev-libs/glib-2.50:2 dev-libs/libgee:0.8[introspection] >=x11-libs/gtk+-3.22:3[introspection]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/elementary/granite/archive/5.2.5.tar.gz -> granite-5.2.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	fdaf2a7b9376934c1c7ddbd32114defb	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56d30e7800345a8436a0851b7cb55917
+_md5_=cbddbf369c34892fe459d6c499a3f2da
diff --git a/metadata/md5-cache/dev-libs/granite-5.5.0 b/metadata/md5-cache/dev-libs/granite-5.5.0
new file mode 100644
index 000000000000..3b3b02c54181
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/granite-5.5.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) virtual/pkgconfig doc? ( >=dev-lang/vala-0.40.20[valadoc] dev-util/gtk-doc ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection] dev-libs/libgee:0.8[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Elementary OS library that extends GTK+
+EAPI=7
+HOMEPAGE=https://github.com/elementary/granite
+IUSE=doc
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-3+
+RDEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection] dev-libs/libgee:0.8[introspection]
+SLOT=0
+SRC_URI=https://github.com/elementary/granite/archive/5.5.0.tar.gz -> granite-5.5.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	fdaf2a7b9376934c1c7ddbd32114defb	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=15abcca204b2cae62ebba8bf54a93cdb
diff --git a/metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140719-r1 b/metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140719-r1
index 2229d013ffab..28bd8e053006 100644
--- a/metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140719-r1
+++ b/metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140719-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A multi-platform library for USB and Bluetooth HID-Class devices
 EAPI=7
 HOMEPAGE=http://www.signal11.us/oss/hidapi/
 IUSE=doc fox abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( BSD GPL-3 HIDAPI )
 RDEPEND=virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/signal11/hidapi/archive/d17db57b9d4354752e0af42f5f33007a42ef2906.tar.gz -> hidapi-0.8.0_rc1_p20140719.tgz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5441fb836acf88b41cd243cba30e7b4d
+_md5_=47c95dd5c1dd2c267dccdeac5ad773fc
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.11.0 b/metadata/md5-cache/dev-libs/libevdev-1.11.0
new file mode 100644
index 000000000000..353e5e39f342
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libevdev-1.11.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test
+DEPEND=test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Handler library for evdev events
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev
+IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.freedesktop.org/software/libevdev/libevdev-1.11.0.tar.xz
+_eclasses_=meson	fdaf2a7b9376934c1c7ddbd32114defb	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=29219ce7ccdfe5e8ef771d0462c8543f
diff --git a/metadata/md5-cache/dev-libs/liboil-0.3.17-r3 b/metadata/md5-cache/dev-libs/liboil-0.3.17-r3
index 57ca5088b6b3..489d6c336c0d 100644
--- a/metadata/md5-cache/dev-libs/liboil-0.3.17-r3
+++ b/metadata/md5-cache/dev-libs/liboil-0.3.17-r3
@@ -5,11 +5,11 @@ DESCRIPTION=Library of simple functions that are optimized for various CPUs
 EAPI=7
 HOMEPAGE=https://liboil.freedesktop.org/
 IUSE=+examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=examples? ( dev-libs/glib:2 )
 RESTRICT=!test? ( test )
 SLOT=0.3
 SRC_URI=https://liboil.freedesktop.org/download/liboil-0.3.17.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5850920150273adb06f348c9470194eb
+_md5_=945f62ffcbaa65546b25b1734e105db2
diff --git a/metadata/md5-cache/dev-libs/udis86-1.7.2-r1 b/metadata/md5-cache/dev-libs/udis86-1.7.2-r1
index a689f8caedd1..5d40985425a3 100644
--- a/metadata/md5-cache/dev-libs/udis86-1.7.2-r1
+++ b/metadata/md5-cache/dev-libs/udis86-1.7.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Disassembler library for the x86/-64 architecture sets
 EAPI=7
 HOMEPAGE=http://udis86.sourceforge.net/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/udis86/udis86-1.7.2.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a3e29a712411bc3631e798d979d5356d
+_md5_=c5e005c195eee6aaa39a43d9206968ae
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index d4d09b9f7992..2474be665aa0 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/dune-2.8.2 b/metadata/md5-cache/dev-ml/dune-2.8.2
index 34028129968d..99450490b210 100644
--- a/metadata/md5-cache/dev-ml/dune-2.8.2
+++ b/metadata/md5-cache/dev-ml/dune-2.8.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-lang/ocaml
+DEPEND=>=dev-lang/ocaml-4.08:= !dev-ml/jbuilder dev-ml/findlib
 DESCRIPTION=A composable build system for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/dune
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=dev-lang/ocaml !dev-ml/jbuilder
+RDEPEND=>=dev-lang/ocaml-4.08:= !dev-ml/jbuilder
 SLOT=0/2.8.2
 SRC_URI=https://github.com/ocaml/dune/archive/2.8.2.tar.gz -> dune-2.8.2.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=c3702220d1e7335a3718227817340d65
+_md5_=130ab9cfa3f632c60847d336529d8d80
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r2 b/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r2
index 1bd46639ea12..b61d14cb2989 100644
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r2
+++ b/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r2
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/ocaml-3.12.1:= <dev-lang/ocaml-4.10.0:= >=dev-ml/ocaml-fileutils-0.4.0:= >=dev-ml/camomile-0.8.3:= sys-devel/gettext dev-ml/camlp4:= doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
+DEPEND=>=dev-lang/ocaml-3.12.1:= <dev-lang/ocaml-4.10.0:= >=dev-ml/ocaml-fileutils-0.4.0:= >=dev-ml/camomile-0.8.3:= sys-devel/gettext dev-ml/camlp4:= !dev-ml/ocaml-gettext-stub doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Provides support for internationalization of OCaml program
 EAPI=7
 HOMEPAGE=https://github.com/gildor478/ocaml-gettext
 IUSE=doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-3.12.1:= <dev-lang/ocaml-4.10.0:= >=dev-ml/ocaml-fileutils-0.4.0:= >=dev-ml/camomile-0.8.3:= sys-devel/gettext dev-ml/camlp4:=
+RDEPEND=>=dev-lang/ocaml-3.12.1:= <dev-lang/ocaml-4.10.0:= >=dev-ml/ocaml-fileutils-0.4.0:= >=dev-ml/camomile-0.8.3:= sys-devel/gettext dev-ml/camlp4:= !dev-ml/ocaml-gettext-stub
 RESTRICT=!test? ( test )
 SLOT=0/0.3.7
 SRC_URI=https://github.com/gildor478/ocaml-gettext/archive/0.3.7.tar.gz -> ocaml-gettext-0.3.7.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	9674d5e3d151793fecab20e2bb73e6c6	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2b162d6e9783072fc4041212c49de77e
+_md5_=f9354f7acec669b5f33195d7b5d982ba
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2 b/metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2
index 5ebd7f14fb89..30bef2a02b71 100644
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2
+++ b/metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-ml/cppo-1.6.6 dev-ml/dune-configurator dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/base:= dev-ml/camomile:=[ocamlopt=] dev-ml/ocaml-gettext:= test? ( dev-ml/ocaml-fileutils dev-ml/ounit[ocamlopt=] ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DEPEND=dev-ml/base:= dev-ml/camomile:=[ocamlopt=] dev-ml/ocaml-gettext:= !<dev-ml/ocaml-gettext-0.4.2 test? ( dev-ml/ocaml-fileutils dev-ml/ounit[ocamlopt=] ) >=dev-lang/ocaml-4:=[ocamlopt?]
 DESCRIPTION=Support for internationalization of OCaml programs using native gettext library
 EAPI=7
 HOMEPAGE=https://github.com/gildor478/ocaml-gettext
 IUSE=+ocamlopt test
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-ml/base:= dev-ml/camomile:=[ocamlopt=] dev-ml/ocaml-gettext:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RDEPEND=dev-ml/base:= dev-ml/camomile:=[ocamlopt=] dev-ml/ocaml-gettext:= !<dev-ml/ocaml-gettext-0.4.2 >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.4.2
 SRC_URI=https://github.com/gildor478/ocaml-gettext/archive/v0.4.2.tar.gz -> ocaml-gettext-0.4.2.tar.gz
 _eclasses_=dune	47ad7c3f0508f77304c2d036ca24bcfa
-_md5_=24577c96c186872fc49855ce2f0641a6
+_md5_=3444b53b269923292727dc86d9949436
diff --git a/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.10 b/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.10
new file mode 100644
index 000000000000..425058618f99
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.10
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune-configurator dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-libs/openssl:0= >=dev-lang/ocaml-3.10:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=OCaml bindings for OpenSSL
+EAPI=7
+HOMEPAGE=https://github.com/savonet/ocaml-ssl
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/openssl:0= >=dev-lang/ocaml-3.10:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.5.10
+SRC_URI=https://github.com/savonet/ocaml-ssl/archive/v0.5.10.tar.gz -> ocaml-ssl-0.5.10.tar.gz
+_eclasses_=dune	47ad7c3f0508f77304c2d036ca24bcfa
+_md5_=3bbcd622516edebc86175c154cd0bd9f
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 24c037eef87e..95eee938beaf 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.10 b/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.10
new file mode 100644
index 000000000000..6ffd018c4c9d
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm test
+DEPEND=test? ( dev-php/PEAR-PEAR )
+DESCRIPTION=Create and manipulate mime messages with PHP
+EAPI=7
+HOMEPAGE=https://pear.php.net/package/Mail_Mime
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://pear.php.net/get/Mail_Mime-1.10.10.tgz
+_eclasses_=php-pear-r2	04ac1c3f5c35d8296eb969ef31e8477c
+_md5_=b67291d6416e8f99f651f092392e3f8f
diff --git a/metadata/md5-cache/dev-php/PHP_CodeSniffer-3.5.8 b/metadata/md5-cache/dev-php/PHP_CodeSniffer-3.5.8
new file mode 100644
index 000000000000..49b87ef7c232
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PHP_CodeSniffer-3.5.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare test
+DEPEND=test? ( dev-lang/php:*[cli(-),tokenizer(-),xmlwriter(-)] <dev-php/phpunit-6 )
+DESCRIPTION=Detect violations of PHP code standards
+EAPI=7
+HOMEPAGE=https://github.com/squizlabs/PHP_CodeSniffer
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-lang/php:*[cli(-),tokenizer(-),xmlwriter(-)]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://download.pear.php.net/package/PHP_CodeSniffer-3.5.8.tgz
+_md5_=271ab82270d0780e8bd1fd2aa8d9f796
diff --git a/metadata/md5-cache/dev-php/adodb-5.20.20 b/metadata/md5-cache/dev-php/adodb-5.20.20
new file mode 100644
index 000000000000..d94868f4b7aa
--- /dev/null
+++ b/metadata/md5-cache/dev-php/adodb-5.20.20
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Database abstraction layer for PHP
+EAPI=7
+HOMEPAGE=https://adodb.org/ https://github.com/ADOdb/ADOdb
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD LGPL-2.1+
+RDEPEND=dev-lang/php:*
+SLOT=0
+SRC_URI=https://github.com/ADOdb/ADOdb/archive/v5.20.20.tar.gz -> adodb-5.20.20.tar.gz
+_md5_=58c95b5f56b11a22f12c2a1c0cbcb2c7
diff --git a/metadata/md5-cache/dev-php/composer-1.10.1 b/metadata/md5-cache/dev-php/composer-1.10.1
deleted file mode 100644
index c02c81deda49..000000000000
--- a/metadata/md5-cache/dev-php/composer-1.10.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Dependency Manager for PHP
-EAPI=7
-HOMEPAGE=https://github.com/composer/composer
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.1.3 >=dev-php/psr-log-1.1.0 dev-php/fedora-autoloader >=dev-php/json-schema-5.2.7 >=dev-php/jsonlint-1.7.1 >=dev-php/phar-utils-1.0.1 >=dev-php/semver-1.4.2 >=dev-php/spdx-licenses-1.5.0 >=dev-php/symfony-console-2.8.48 >=dev-php/symfony-filesystem-2.8.48 >=dev-php/symfony-finder-2.8.49 >=dev-php/symfony-process-2.8.48 >=dev-php/xdebug-handler-1.3.1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/composer/composer/archive/1.10.1.tar.gz -> composer-1.10.1.tar.gz
-_md5_=ade177e75edcf458742299a2d24571a6
diff --git a/metadata/md5-cache/dev-php/composer-1.10.10 b/metadata/md5-cache/dev-php/composer-1.10.10
deleted file mode 100644
index d7c42d830f06..000000000000
--- a/metadata/md5-cache/dev-php/composer-1.10.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Dependency Manager for PHP
-EAPI=7
-HOMEPAGE=https://github.com/composer/composer
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.1.3 >=dev-php/psr-log-1.1.0 dev-php/fedora-autoloader >=dev-php/json-schema-5.2.7 >=dev-php/jsonlint-1.7.1 >=dev-php/phar-utils-1.0.1 >=dev-php/semver-1.4.2 >=dev-php/spdx-licenses-1.5.0 >=dev-php/symfony-console-2.8.48 >=dev-php/symfony-filesystem-2.8.48 >=dev-php/symfony-finder-2.8.49 >=dev-php/symfony-process-2.8.48 >=dev-php/xdebug-handler-1.3.1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/composer/composer/archive/1.10.10.tar.gz -> composer-1.10.10.tar.gz
-_md5_=ade177e75edcf458742299a2d24571a6
diff --git a/metadata/md5-cache/dev-php/composer-1.10.13 b/metadata/md5-cache/dev-php/composer-1.10.13
deleted file mode 100644
index 0ec2784d597d..000000000000
--- a/metadata/md5-cache/dev-php/composer-1.10.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Dependency Manager for PHP
-EAPI=7
-HOMEPAGE=https://github.com/composer/composer
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.1.3 >=dev-php/psr-log-1.1.0 dev-php/fedora-autoloader >=dev-php/json-schema-5.2.7 >=dev-php/jsonlint-1.7.1 >=dev-php/phar-utils-1.0.1 >=dev-php/semver-1.4.2 >=dev-php/spdx-licenses-1.5.0 >=dev-php/symfony-console-2.8.48 >=dev-php/symfony-filesystem-2.8.48 >=dev-php/symfony-finder-2.8.49 >=dev-php/symfony-process-2.8.48 >=dev-php/xdebug-handler-1.3.1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/composer/composer/archive/1.10.13.tar.gz -> composer-1.10.13.tar.gz
-_md5_=ade177e75edcf458742299a2d24571a6
diff --git a/metadata/md5-cache/dev-php/composer-1.10.20 b/metadata/md5-cache/dev-php/composer-1.10.20
new file mode 100644
index 000000000000..c86a24c79e1a
--- /dev/null
+++ b/metadata/md5-cache/dev-php/composer-1.10.20
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=Dependency Manager for PHP
+EAPI=7
+HOMEPAGE=https://github.com/composer/composer
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.1.3 >=dev-php/psr-log-1.1.0 dev-php/fedora-autoloader >=dev-php/json-schema-5.2.10 >=dev-php/jsonlint-1.7.1 >=dev-php/phar-utils-1.0.1 >=dev-php/semver-1.4.2 >=dev-php/spdx-licenses-1.5.0 >=dev-php/symfony-console-2.8.48 >=dev-php/symfony-filesystem-2.8.48 >=dev-php/symfony-finder-2.8.49 >=dev-php/symfony-process-2.8.48 >=dev-php/xdebug-handler-1.3.1
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/composer/composer/archive/1.10.20.tar.gz -> composer-1.10.20.tar.gz
+_md5_=4743fd5a31a3c49c6a2160bdc58c136c
diff --git a/metadata/md5-cache/dev-php/composer-1.10.5 b/metadata/md5-cache/dev-php/composer-1.10.5
deleted file mode 100644
index e9f52b494587..000000000000
--- a/metadata/md5-cache/dev-php/composer-1.10.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Dependency Manager for PHP
-EAPI=7
-HOMEPAGE=https://github.com/composer/composer
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.1.3 >=dev-php/psr-log-1.1.0 dev-php/fedora-autoloader >=dev-php/json-schema-5.2.7 >=dev-php/jsonlint-1.7.1 >=dev-php/phar-utils-1.0.1 >=dev-php/semver-1.4.2 >=dev-php/spdx-licenses-1.5.0 >=dev-php/symfony-console-2.8.48 >=dev-php/symfony-filesystem-2.8.48 >=dev-php/symfony-finder-2.8.49 >=dev-php/symfony-process-2.8.48 >=dev-php/xdebug-handler-1.3.1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/composer/composer/archive/1.10.5.tar.gz -> composer-1.10.5.tar.gz
-_md5_=ade177e75edcf458742299a2d24571a6
diff --git a/metadata/md5-cache/dev-php/composer-1.10.6 b/metadata/md5-cache/dev-php/composer-1.10.6
deleted file mode 100644
index db3c3f260e6d..000000000000
--- a/metadata/md5-cache/dev-php/composer-1.10.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Dependency Manager for PHP
-EAPI=7
-HOMEPAGE=https://github.com/composer/composer
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.1.3 >=dev-php/psr-log-1.1.0 dev-php/fedora-autoloader >=dev-php/json-schema-5.2.7 >=dev-php/jsonlint-1.7.1 >=dev-php/phar-utils-1.0.1 >=dev-php/semver-1.4.2 >=dev-php/spdx-licenses-1.5.0 >=dev-php/symfony-console-2.8.48 >=dev-php/symfony-filesystem-2.8.48 >=dev-php/symfony-finder-2.8.49 >=dev-php/symfony-process-2.8.48 >=dev-php/xdebug-handler-1.3.1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/composer/composer/archive/1.10.6.tar.gz -> composer-1.10.6.tar.gz
-_md5_=ade177e75edcf458742299a2d24571a6
diff --git a/metadata/md5-cache/dev-php/composer-1.10.7 b/metadata/md5-cache/dev-php/composer-1.10.7
deleted file mode 100644
index f5cec9862001..000000000000
--- a/metadata/md5-cache/dev-php/composer-1.10.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Dependency Manager for PHP
-EAPI=7
-HOMEPAGE=https://github.com/composer/composer
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.1.3 >=dev-php/psr-log-1.1.0 dev-php/fedora-autoloader >=dev-php/json-schema-5.2.7 >=dev-php/jsonlint-1.7.1 >=dev-php/phar-utils-1.0.1 >=dev-php/semver-1.4.2 >=dev-php/spdx-licenses-1.5.0 >=dev-php/symfony-console-2.8.48 >=dev-php/symfony-filesystem-2.8.48 >=dev-php/symfony-finder-2.8.49 >=dev-php/symfony-process-2.8.48 >=dev-php/xdebug-handler-1.3.1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/composer/composer/archive/1.10.7.tar.gz -> composer-1.10.7.tar.gz
-_md5_=ade177e75edcf458742299a2d24571a6
diff --git a/metadata/md5-cache/dev-php/composer-1.10.8 b/metadata/md5-cache/dev-php/composer-1.10.8
deleted file mode 100644
index 08eb04af4915..000000000000
--- a/metadata/md5-cache/dev-php/composer-1.10.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Dependency Manager for PHP
-EAPI=7
-HOMEPAGE=https://github.com/composer/composer
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.1.3 >=dev-php/psr-log-1.1.0 dev-php/fedora-autoloader >=dev-php/json-schema-5.2.7 >=dev-php/jsonlint-1.7.1 >=dev-php/phar-utils-1.0.1 >=dev-php/semver-1.4.2 >=dev-php/spdx-licenses-1.5.0 >=dev-php/symfony-console-2.8.48 >=dev-php/symfony-filesystem-2.8.48 >=dev-php/symfony-finder-2.8.49 >=dev-php/symfony-process-2.8.48 >=dev-php/xdebug-handler-1.3.1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/composer/composer/archive/1.10.8.tar.gz -> composer-1.10.8.tar.gz
-_md5_=ade177e75edcf458742299a2d24571a6
diff --git a/metadata/md5-cache/dev-php/composer-1.10.9 b/metadata/md5-cache/dev-php/composer-1.10.9
deleted file mode 100644
index 5481f10c7507..000000000000
--- a/metadata/md5-cache/dev-php/composer-1.10.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Dependency Manager for PHP
-EAPI=7
-HOMEPAGE=https://github.com/composer/composer
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.1.3 >=dev-php/psr-log-1.1.0 dev-php/fedora-autoloader >=dev-php/json-schema-5.2.7 >=dev-php/jsonlint-1.7.1 >=dev-php/phar-utils-1.0.1 >=dev-php/semver-1.4.2 >=dev-php/spdx-licenses-1.5.0 >=dev-php/symfony-console-2.8.48 >=dev-php/symfony-filesystem-2.8.48 >=dev-php/symfony-finder-2.8.49 >=dev-php/symfony-process-2.8.48 >=dev-php/xdebug-handler-1.3.1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/composer/composer/archive/1.10.9.tar.gz -> composer-1.10.9.tar.gz
-_md5_=ade177e75edcf458742299a2d24571a6
diff --git a/metadata/md5-cache/dev-php/composer-1.9.3 b/metadata/md5-cache/dev-php/composer-1.9.3
deleted file mode 100644
index df91d6aaa550..000000000000
--- a/metadata/md5-cache/dev-php/composer-1.9.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Dependency Manager for PHP
-EAPI=7
-HOMEPAGE=https://github.com/composer/composer
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.1.3 >=dev-php/psr-log-1.1.0 dev-php/fedora-autoloader >=dev-php/json-schema-5.2.7 >=dev-php/jsonlint-1.7.1 >=dev-php/phar-utils-1.0.1 >=dev-php/semver-1.4.2 >=dev-php/spdx-licenses-1.5.0 >=dev-php/symfony-console-2.8.48 >=dev-php/symfony-filesystem-2.8.48 >=dev-php/symfony-finder-2.8.49 >=dev-php/symfony-process-2.8.48 >=dev-php/xdebug-handler-1.3.1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/composer/composer/archive/1.9.3.tar.gz -> composer-1.9.3.tar.gz
-_md5_=ade177e75edcf458742299a2d24571a6
diff --git a/metadata/md5-cache/dev-php/composer-2.0.9 b/metadata/md5-cache/dev-php/composer-2.0.9
new file mode 100644
index 000000000000..2d9c6c726c55
--- /dev/null
+++ b/metadata/md5-cache/dev-php/composer-2.0.9
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Dependency Manager for PHP
+EAPI=7
+HOMEPAGE=https://github.com/composer/composer
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.0 dev-php/fedora-autoloader >=dev-php/jsonlint-1.4 >=dev-php/json-schema-5.2.10 >=dev-php/phar-utils-1.0 >=dev-php/psr-log-1.0 >=dev-php/reactphp-promise-2.7 >=dev-php/semver-3.0 >=dev-php/spdx-licenses-1.2 >=dev-php/symfony-console-2.8.52 >=dev-php/symfony-filesystem-2.8.52 >=dev-php/symfony-finder-2.8.52 >=dev-php/symfony-process-2.8.52 >=dev-php/xdebug-handler-1.1
+SLOT=0
+SRC_URI=https://github.com/composer/composer/archive/2.0.9.tar.gz -> composer-2.0.9.tar.gz
+_md5_=a9f7d142a7110aeda4158bf11197803e
diff --git a/metadata/md5-cache/dev-php/doctrine-instantiator-1.4.0 b/metadata/md5-cache/dev-php/doctrine-instantiator-1.4.0
new file mode 100644
index 000000000000..30132f9fa4b8
--- /dev/null
+++ b/metadata/md5-cache/dev-php/doctrine-instantiator-1.4.0
@@ -0,0 +1,11 @@
+BDEPEND=dev-php/theseer-Autoload
+DEFINED_PHASES=install prepare
+DESCRIPTION=Utility to instantiate objects in PHP without invoking their constructors
+EAPI=7
+HOMEPAGE=https://github.com/doctrine/instantiator
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.2:*
+SLOT=0
+SRC_URI=https://github.com/doctrine//instantiator/archive/1.4.0.tar.gz -> doctrine-instantiator-1.4.0.tar.gz
+_md5_=54a0c52de307105239e53b75d25dbf4e
diff --git a/metadata/md5-cache/dev-php/jsonlint-1.8.3 b/metadata/md5-cache/dev-php/jsonlint-1.8.3
new file mode 100644
index 000000000000..01956b7b6bcf
--- /dev/null
+++ b/metadata/md5-cache/dev-php/jsonlint-1.8.3
@@ -0,0 +1,11 @@
+BDEPEND=dev-php/theseer-Autoload
+DEFINED_PHASES=install prepare
+DESCRIPTION=JSON Lint for PHP
+EAPI=7
+HOMEPAGE=https://github.com/Seldaek/jsonlint
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-php/fedora-autoloader dev-lang/php:*
+SLOT=0
+SRC_URI=https://github.com/Seldaek/jsonlint/archive/1.8.3.tar.gz -> jsonlint-1.8.3.tar.gz
+_md5_=decf872e3c37686995b19b586812bd21
diff --git a/metadata/md5-cache/dev-php/pecl-http-3.2.3 b/metadata/md5-cache/dev-php/pecl-http-3.2.3
deleted file mode 100644
index 8982336e15a8..000000000000
--- a/metadata/md5-cache/dev-php/pecl-http-3.2.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] ) php_targets_php7-2? ( dev-lang/php:7.2[hash,session,iconv] ) php_targets_php7-3? ( dev-lang/php:7.3[hash,session,iconv] ) php_targets_php7-4? ( dev-lang/php:7.4[session,iconv] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-DESCRIPTION=Extended HTTP Support for PHP
-EAPI=7
-HOMEPAGE=https://pecl.php.net/pecl_http
-IUSE=ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl php_targets_php5-6 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 MIT
-RDEPEND=app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] ) php_targets_php7-2? ( dev-lang/php:7.2[hash,session,iconv] ) php_targets_php7-3? ( dev-lang/php:7.3[hash,session,iconv] ) php_targets_php7-4? ( dev-lang/php:7.4[session,iconv] ) php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/pecl_http-3.2.3.tgz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=83153d77e9c4a55ab14835d1c341a666
diff --git a/metadata/md5-cache/dev-php/pecl-http-3.2.3-r1 b/metadata/md5-cache/dev-php/pecl-http-3.2.3-r1
deleted file mode 100644
index 95f3298c1736..000000000000
--- a/metadata/md5-cache/dev-php/pecl-http-3.2.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-2? ( app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:7.2[hash,session,iconv] ) php_targets_php7-3? ( app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:7.3[hash,session,iconv] ) php_targets_php7-4? ( app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:7.4[session,iconv] ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-DESCRIPTION=Extended HTTP Support for PHP
-EAPI=7
-HOMEPAGE=https://pecl.php.net/pecl_http
-IUSE=ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 MIT
-RDEPEND=php_targets_php7-2? ( app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:7.2[hash,session,iconv] ) php_targets_php7-3? ( app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:7.3[hash,session,iconv] ) php_targets_php7-4? ( app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:7.4[session,iconv] ) php_targets_php8-0? ( dev-php/pecl-http:8[php_targets_php8-0(-)] ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-REQUIRED_USE=|| ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/pecl_http-3.2.3.tgz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8411f9921dc3470c1f852d0a3bd0fe26
diff --git a/metadata/md5-cache/dev-php/pecl-http-3.2.4 b/metadata/md5-cache/dev-php/pecl-http-3.2.4
index ebabe3a80d94..234abcbb19b1 100644
--- a/metadata/md5-cache/dev-php/pecl-http-3.2.4
+++ b/metadata/md5-cache/dev-php/pecl-http-3.2.4
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-3? ( app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:7.3[hash,session,iconv] ) php_targets_php7-4? ( app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:7.4[session,iconv] ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEPEND=php_targets_php7-3? ( app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:7.3[hash(+),session(-),iconv(-)] ) php_targets_php7-4? ( app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:7.4[session(-),iconv(-)] ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
 DESCRIPTION=Extended HTTP Support for PHP
 EAPI=7
 HOMEPAGE=https://pecl.php.net/pecl_http
-IUSE=ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
+IUSE=ssl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2 MIT
-RDEPEND=php_targets_php7-3? ( app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:7.3[hash,session,iconv] ) php_targets_php7-4? ( app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:7.4[session,iconv] ) php_targets_php8-0? ( dev-php/pecl-http:8[php_targets_php8-0(-)] ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+RDEPEND=php_targets_php7-3? ( app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:7.3[hash(+),session(-),iconv(-)] ) php_targets_php7-4? ( app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:7.4[session(-),iconv(-)] ) php_targets_php8-0? ( dev-php/pecl-http:8[php_targets_php8-0(-)] ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
 REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/pecl_http-3.2.4.tgz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2e5fdb76ec829d08e91add8275d8e84f
+_md5_=39e43b661a8ee7394515f476dd1ff08e
diff --git a/metadata/md5-cache/dev-php/pecl-http-4.0.0 b/metadata/md5-cache/dev-php/pecl-http-4.0.0
index 4b2769c06ddb..1c13d9b99637 100644
--- a/metadata/md5-cache/dev-php/pecl-http-4.0.0
+++ b/metadata/md5-cache/dev-php/pecl-http-4.0.0
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php8-0? ( app-arch/brotli:= dev-libs/libevent >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:8.0[session,iconv] ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEPEND=php_targets_php8-0? ( app-arch/brotli:= dev-libs/libevent >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:8.0[session(-),iconv(-)] ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
 DESCRIPTION=Extended HTTP Support for PHP
 EAPI=7
 HOMEPAGE=https://pecl.php.net/pecl_http
-IUSE=ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
+IUSE=ssl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2 MIT
-RDEPEND=php_targets_php8-0? ( app-arch/brotli:= dev-libs/libevent >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:8.0[session,iconv] ) php_targets_php7-3? ( dev-php/pecl-http:7[php_targets_php7-3(-)] ) php_targets_php7-4? ( dev-php/pecl-http:7[php_targets_php7-4(-)] ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+RDEPEND=php_targets_php8-0? ( app-arch/brotli:= dev-libs/libevent >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:8.0[session(-),iconv(-)] ) php_targets_php7-3? ( dev-php/pecl-http:7[php_targets_php7-3(-)] ) php_targets_php7-4? ( dev-php/pecl-http:7[php_targets_php7-4(-)] ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
 REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
 SLOT=8
 SRC_URI=https://pecl.php.net/get/pecl_http-4.0.0.tgz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0cf3c5d100ccf7738da4db6824662d84
+_md5_=98f7fa27ae21299d10a907ade33d8877
diff --git a/metadata/md5-cache/dev-php/pecl-http-4.0.0_beta1 b/metadata/md5-cache/dev-php/pecl-http-4.0.0_beta1
deleted file mode 100644
index 28cef30b1280..000000000000
--- a/metadata/md5-cache/dev-php/pecl-http-4.0.0_beta1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php8-0? ( app-arch/brotli:= dev-libs/libevent >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:8.0[session,iconv] ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-DESCRIPTION=Extended HTTP Support for PHP
-EAPI=7
-HOMEPAGE=https://pecl.php.net/pecl_http
-IUSE=ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 MIT
-RDEPEND=php_targets_php8-0? ( app-arch/brotli:= dev-libs/libevent >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:8.0[session,iconv] ) php_targets_php7-2? ( dev-php/pecl-http:7[php_targets_php7-2(-)] ) php_targets_php7-3? ( dev-php/pecl-http:7[php_targets_php7-3(-)] ) php_targets_php7-4? ( dev-php/pecl-http:7[php_targets_php7-4(-)] ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-REQUIRED_USE=|| ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
-SLOT=8
-SRC_URI=https://pecl.php.net/get/pecl_http-4.0.0beta1.tgz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e59f0e7097b941f99359577715172f77
diff --git a/metadata/md5-cache/dev-php/pecl-timezonedb-2021.1 b/metadata/md5-cache/dev-php/pecl-timezonedb-2021.1
new file mode 100644
index 000000000000..119f6c1f15f9
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-timezonedb-2021.1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DESCRIPTION=Timezone Database to be used with PHP's date and time functions
+EAPI=7
+HOMEPAGE=https://pecl.php.net/timezonedb
+IUSE=php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=PHP-3
+RDEPEND=php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
+SLOT=0
+SRC_URI=https://pecl.php.net/get/timezonedb-2021.1.tgz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8d2b40a2c61c0d7f9fd20dd06c21d121
diff --git a/metadata/md5-cache/dev-php/phar-io-manifest-2.0.1 b/metadata/md5-cache/dev-php/phar-io-manifest-2.0.1
new file mode 100644
index 000000000000..9a2e4f2fc192
--- /dev/null
+++ b/metadata/md5-cache/dev-php/phar-io-manifest-2.0.1
@@ -0,0 +1,12 @@
+BDEPEND=dev-php/theseer-Autoload
+DEFINED_PHASES=install prepare
+DESCRIPTION=Reading phar.io manifest information from a PHP Archive (PHAR)
+EAPI=7
+HOMEPAGE=https://github.com/phar-io/manifest
+IUSE=examples
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-php/fedora-autoloader >=dev-php/phar-io-version-3.0.1 >=dev-lang/php-7.2:*[phar,xml(-),xmlwriter(-)]
+SLOT=0
+SRC_URI=https://github.com/phar-io/manifest/archive/2.0.1.tar.gz -> phar-io-manifest-2.0.1.tar.gz
+_md5_=b66283345bf0db14aa418de0816e3734
diff --git a/metadata/md5-cache/dev-php/phar-io-version-3.0.4 b/metadata/md5-cache/dev-php/phar-io-version-3.0.4
new file mode 100644
index 000000000000..9d97f38dd3d0
--- /dev/null
+++ b/metadata/md5-cache/dev-php/phar-io-version-3.0.4
@@ -0,0 +1,11 @@
+BDEPEND=dev-php/theseer-Autoload
+DEFINED_PHASES=install prepare
+DESCRIPTION=Library for handling version information and constraints
+EAPI=7
+HOMEPAGE=https://github.com/phar-io/version
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.2:*
+SLOT=0
+SRC_URI=https://github.com/phar-io/version/archive/3.0.4.tar.gz -> phar-io-version-3.0.4.tar.gz
+_md5_=a18a0cc4720b3953d99bdd526a97decf
diff --git a/metadata/md5-cache/dev-php/phpunit-8.5.14 b/metadata/md5-cache/dev-php/phpunit-8.5.14
new file mode 100644
index 000000000000..3805b3db33e1
--- /dev/null
+++ b/metadata/md5-cache/dev-php/phpunit-8.5.14
@@ -0,0 +1,11 @@
+BDEPEND=dev-php/theseer-Autoload
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=A PHP Unit Testing framework
+EAPI=7
+HOMEPAGE=https://phpunit.de
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-php/fedora-autoloader >=dev-php/File_Iterator-2.0.2 >=dev-php/Text_Template-1.2.1 >=dev-php/PHP_CodeCoverage-7.0.12 >=dev-php/PHP_Timer-2.1.2 >=dev-php/doctrine-instantiator-1.3.1 >=dev-php/myclabs-deepcopy-1.10.0 >=dev-php/phar-io-manifest-2.0.1 >=dev-php/phar-io-version-3.0.2 >=dev-php/phpspec-prophecy-1.10.3 >=dev-php/sebastian-comparator-3.0.2 >=dev-php/sebastian-diff-3.0.2 >=dev-php/sebastian-environment-4.2.3 >=dev-php/sebastian-exporter-3.1.2 >=dev-php/sebastian-global-state-3.0.0 >=dev-php/sebastian-object-enumerator-3.0.3 >=dev-php/sebastian-resource-operations-2.0.1 >=dev-php/sebastian-type-1.1.3 >=dev-php/sebastian-version-2.0.1 || ( dev-lang/php:8.0[cli(-),unicode(-),xml(-),xmlwriter(-)] dev-lang/php:7.4[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] dev-lang/php:7.3[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] dev-lang/php:7.2[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] ) !dev-php/phpunit-mock-objects
+SLOT=0
+SRC_URI=https://github.com/sebastianbergmann/phpunit/archive/8.5.14.tar.gz -> phpunit-8.5.14.tar.gz
+_md5_=19dced55c8557712de352b6ac28598e3
diff --git a/metadata/md5-cache/dev-php/reactphp-promise-2.8.0 b/metadata/md5-cache/dev-php/reactphp-promise-2.8.0
new file mode 100644
index 000000000000..55f734fd1f04
--- /dev/null
+++ b/metadata/md5-cache/dev-php/reactphp-promise-2.8.0
@@ -0,0 +1,11 @@
+BDEPEND=dev-php/theseer-Autoload
+DEFINED_PHASES=install prepare
+DESCRIPTION=A lightweight implementation of CommonJS Promises/A for PHP
+EAPI=7
+HOMEPAGE=https://reactphp.org/promise/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.2:*
+SLOT=0
+SRC_URI=https://github.com/reactphp/promise/archive/v2.8.0.tar.gz -> reactphp-promise-2.8.0.tar.gz
+_md5_=9d4db6ce8d291ab325d0cfcb9b4fac1a
diff --git a/metadata/md5-cache/dev-php/scrypt-1.4.2 b/metadata/md5-cache/dev-php/scrypt-1.4.2
new file mode 100644
index 000000000000..589efbf19b6c
--- /dev/null
+++ b/metadata/md5-cache/dev-php/scrypt-1.4.2
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/re2c php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DESCRIPTION=A PHP wrapper fo the scrypt hashing algorithm
+EAPI=7
+HOMEPAGE=https://pecl.php.net/scrypt
+IUSE=php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
+SLOT=0
+SRC_URI=https://pecl.php.net/get/scrypt-1.4.2.tgz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=9012e564ba3c14e6a96146b926c9c008
diff --git a/metadata/md5-cache/dev-php/scrypt-9999 b/metadata/md5-cache/dev-php/scrypt-9999
new file mode 100644
index 000000000000..c0372bf2a45f
--- /dev/null
+++ b/metadata/md5-cache/dev-php/scrypt-9999
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-util/re2c php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DESCRIPTION=A PHP wrapper fo the scrypt hashing algorithm
+EAPI=7
+HOMEPAGE=https://pecl.php.net/scrypt
+IUSE=php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
+LICENSE=BSD-2
+PROPERTIES=live
+RDEPEND=php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
+SLOT=0
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d466abb4dbbaa98ec3c44ea62cb8cc89
diff --git a/metadata/md5-cache/dev-php/semver-3.2.4 b/metadata/md5-cache/dev-php/semver-3.2.4
new file mode 100644
index 000000000000..3314f928cc40
--- /dev/null
+++ b/metadata/md5-cache/dev-php/semver-3.2.4
@@ -0,0 +1,11 @@
+BDEPEND=dev-php/theseer-Autoload
+DEFINED_PHASES=install prepare
+DESCRIPTION=Semantic versioning utilities, constraint parsing, and checking
+EAPI=7
+HOMEPAGE=https://github.com/composer/semver
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.2:*
+SLOT=0
+SRC_URI=https://github.com/composer/semver/archive/3.2.4.tar.gz -> semver-3.2.4.tar.gz
+_md5_=5cb70c9db1235ad7ee44e8732b406c61
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index d074e1561402..df4df79b190c 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/django-2.2.18 b/metadata/md5-cache/dev-python/django-2.2.18
new file mode 100644
index 000000000000..41763bddd014
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-2.2.18
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) dev-python/pytz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlparse-0.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/docutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pillow[webp,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/selenium[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tblib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-devel/gettext ) verify-sig? ( app-crypt/openpgp-keys-django ) doc? ( dev-python/sphinx ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DESCRIPTION=High-level Python web framework
+EAPI=7
+HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
+IUSE=doc sqlite test doc python_targets_python3_7 python_targets_python3_8 verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=dev-python/pytz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlparse-0.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://media.djangoproject.com/releases/2.2/Django-2.2.18.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-2.2.18.checksum.txt )
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	distutils-r1	5363e4936a5e855108ec3fd191bd2b3c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_md5_=27e67527e69c9477ea89724833974d71
diff --git a/metadata/md5-cache/dev-python/django-3.0.12 b/metadata/md5-cache/dev-python/django-3.0.12
new file mode 100644
index 000000000000..b819c66d5a14
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-3.0.12
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/asgiref[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlparse-0.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/docutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[webp,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/selenium[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/tblib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/gettext ) verify-sig? ( app-crypt/openpgp-keys-django ) doc? ( dev-python/sphinx ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DESCRIPTION=High-level Python web framework
+EAPI=7
+HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
+IUSE=doc sqlite test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=dev-python/asgiref[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlparse-0.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://media.djangoproject.com/releases/3.0/Django-3.0.12.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.0.12.checksum.txt )
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	distutils-r1	5363e4936a5e855108ec3fd191bd2b3c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_md5_=e6a7d2f096e1fb6da46b232d377fd56e
diff --git a/metadata/md5-cache/dev-python/django-3.1.6 b/metadata/md5-cache/dev-python/django-3.1.6
new file mode 100644
index 000000000000..c199b6c887b6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-3.1.6
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/asgiref[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlparse-0.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/docutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[webp,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/selenium[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/tblib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/gettext ) verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 ) doc? ( dev-python/sphinx ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DESCRIPTION=High-level Python web framework
+EAPI=7
+HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
+IUSE=doc sqlite test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=dev-python/asgiref[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlparse-0.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://media.djangoproject.com/releases/3.1/Django-3.1.6.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.1.6.checksum.txt )
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	distutils-r1	5363e4936a5e855108ec3fd191bd2b3c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_md5_=bcb2c9ffd962bcecdcb33fc134228f42
diff --git a/metadata/md5-cache/dev-python/guessit-3.1.1 b/metadata/md5-cache/dev-python/guessit-3.1.1
deleted file mode 100644
index a11a745cc791..000000000000
--- a/metadata/md5-cache/dev-python/guessit-3.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/babelfish-0.5.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rebulk-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library for guessing information from video filenames
-EAPI=7
-HOMEPAGE=https://github.com/guessit-io/guessit https://pypi.org/project/guessit/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-3
-RDEPEND=>=dev-python/babelfish-0.5.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rebulk-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/guessit/guessit-3.1.1.tar.gz
-_eclasses_=distutils-r1	5363e4936a5e855108ec3fd191bd2b3c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1c99f9de7fca1a2f5e6fe8b57e8ad3e7
diff --git a/metadata/md5-cache/dev-python/guessit-3.2.0 b/metadata/md5-cache/dev-python/guessit-3.2.0
index 21ab24531195..9a5a61b81d0e 100644
--- a/metadata/md5-cache/dev-python/guessit-3.2.0
+++ b/metadata/md5-cache/dev-python/guessit-3.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python library for guessing information from video filenames
 EAPI=7
 HOMEPAGE=https://github.com/guessit-io/guessit https://pypi.org/project/guessit/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-python/babelfish-0.5.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rebulk-3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/guessit/guessit-3.2.0.tar.gz
 _eclasses_=distutils-r1	5363e4936a5e855108ec3fd191bd2b3c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a2fd08784ed8ca70c5e600f4ca2757bc
+_md5_=1a8f2332edfb94dbc655b648c9dbc413
diff --git a/metadata/md5-cache/dev-python/joblib-0.17.0 b/metadata/md5-cache/dev-python/joblib-0.17.0
deleted file mode 100644
index 813de7f21feb..000000000000
--- a/metadata/md5-cache/dev-python/joblib-0.17.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cloudpickle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/loky[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/threadpoolctl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/cloudpickle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/loky[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Tools to provide lightweight pipelining in Python
-EAPI=7
-HOMEPAGE=https://joblib.readthedocs.io/en/latest/ https://github.com/joblib/joblib
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=BSD
-RDEPEND=dev-python/cloudpickle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/loky[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/joblib/joblib/archive/0.17.0.tar.gz -> joblib-0.17.0.tar.gz
-_eclasses_=distutils-r1	5363e4936a5e855108ec3fd191bd2b3c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6e7185fd78e9f47e199fdf74abb8ca63
diff --git a/metadata/md5-cache/dev-python/joblib-1.0.0 b/metadata/md5-cache/dev-python/joblib-1.0.0
index 60834acda5f4..ef1d71ea7c24 100644
--- a/metadata/md5-cache/dev-python/joblib-1.0.0
+++ b/metadata/md5-cache/dev-python/joblib-1.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Tools to provide lightweight pipelining in Python
 EAPI=7
 HOMEPAGE=https://joblib.readthedocs.io/en/latest/ https://github.com/joblib/joblib
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-python/cloudpickle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/loky[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joblib/joblib/archive/1.0.0.tar.gz -> joblib-1.0.0.tar.gz
 _eclasses_=distutils-r1	5363e4936a5e855108ec3fd191bd2b3c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=65740e15e798907a4a32d28e095f2d56
+_md5_=3d68490ac5de4ad028dcaa71613c5538
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-2.2.0 b/metadata/md5-cache/dev-python/pytest-xdist-2.2.0
deleted file mode 100644
index 822f2d7e479a..000000000000
--- a/metadata/md5-cache/dev-python/pytest-xdist-2.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Distributed testing and loop-on-failing modes
-EAPI=7
-HOMEPAGE=https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist
-IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-2.2.0.tar.gz
-_eclasses_=distutils-r1	5363e4936a5e855108ec3fd191bd2b3c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2acef45b46f8c81494ea46b2ededd518
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-2.2.0-r1 b/metadata/md5-cache/dev-python/pytest-xdist-2.2.0-r1
index c3b81c538eb3..38a71da14764 100644
--- a/metadata/md5-cache/dev-python/pytest-xdist-2.2.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-xdist-2.2.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Distributed testing and loop-on-failing modes
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-6[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-2.2.0.tar.gz
 _eclasses_=distutils-r1	5363e4936a5e855108ec3fd191bd2b3c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=af0e69ff6ec5183e71c14eacb760002f
+_md5_=eb5f5e0668cd2f34f9125bd6a05fc5e8
diff --git a/metadata/md5-cache/dev-python/setuptools-53.0.0 b/metadata/md5-cache/dev-python/setuptools-53.0.0
new file mode 100644
index 000000000000..cbf3597a17a3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools-53.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of extensions to Distutils
+EAPI=7
+HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+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
+LICENSE=MIT
+PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/setuptools/setuptools-53.0.0.tar.gz
+_eclasses_=distutils-r1	5363e4936a5e855108ec3fd191bd2b3c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=09188a251b22b9b95d74b577ef99f071
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.23 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.23
new file mode 100644
index 000000000000..8d1ce9e126ed
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.3.23
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python SQL toolkit and Object Relational Mapper
+EAPI=7
+HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
+IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.3.23.tar.gz
+_eclasses_=distutils-r1	5363e4936a5e855108ec3fd191bd2b3c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=84044ff408a97229abaa3b09b1d95ddf
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.2-r3 b/metadata/md5-cache/dev-python/urllib3-1.26.2-r3
index 99011fafae3c..90ea5351db5c 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.26.2-r3
+++ b/metadata/md5-cache/dev-python/urllib3-1.26.2-r3
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and mor
 EAPI=7
 HOMEPAGE=https://github.com/urllib3/urllib3
 IUSE=brotli test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.26.2.tar.gz
 _eclasses_=distutils-r1	5363e4936a5e855108ec3fd191bd2b3c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9450b5d0e492c534c1cfa4ebc2c2dea5
+_md5_=0e9a10b93edb7f0d0cfa04f2ba164a5d
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.4.2 b/metadata/md5-cache/dev-python/virtualenv-20.4.2
new file mode 100644
index 000000000000..aedd6a461666
--- /dev/null
+++ b/metadata/md5-cache/dev-python/virtualenv-20.4.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) python_targets_python3_7? ( dev-python/coverage[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/flaky[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-5[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-freezegun-0.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/coverage[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/flaky[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-5[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-freezegun-0.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/coverage[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/flaky[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-5[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-freezegun-0.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/towncrier[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/towncrier[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/towncrier[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/towncrier[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Virtual Python Environment builder
+EAPI=7
+HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
+IUSE=test doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=>=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.4.2.tar.gz
+_eclasses_=distutils-r1	5363e4936a5e855108ec3fd191bd2b3c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=079ade2bb3b55dfe76cb52bff10a38dd
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index c9937d30e8df..cc57e18d3409 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.8.8 b/metadata/md5-cache/dev-ruby/i18n-1.8.8
new file mode 100644
index 000000000000..e1ed9fa387c3
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/i18n-1.8.8
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/activesupport-5.1[ruby_targets_ruby25(-)] dev-ruby/bundler[ruby_targets_ruby25(-)] >=dev-ruby/mocha-1.7.0[ruby_targets_ruby25(-)] dev-ruby/test_declarative[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/activesupport-5.1[ruby_targets_ruby26(-)] dev-ruby/bundler[ruby_targets_ruby26(-)] >=dev-ruby/mocha-1.7.0[ruby_targets_ruby26(-)] dev-ruby/test_declarative[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/activesupport-5.1[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/mocha-1.7.0[ruby_targets_ruby27(-)] dev-ruby/test_declarative[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Add Internationalization support to your Ruby application
+EAPI=7
+HOMEPAGE=http://rails-i18n.org/
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://github.com/svenfuchs/i18n/archive/v1.8.8.tar.gz -> i18n-1.8.8.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=845384bfeed2c6f70f42c35f8874fd7a
diff --git a/metadata/md5-cache/dev-ruby/jbuilder-2.11.2 b/metadata/md5-cache/dev-ruby/jbuilder-2.11.2
new file mode 100644
index 000000000000..f06ff24270be
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/jbuilder-2.11.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/activesupport-5.0.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/activesupport-5.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/activesupport-5.0.0:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/activemodel-5.0.0[ruby_targets_ruby25(-)] >=dev-ruby/railties-5.0.0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/activemodel-5.0.0[ruby_targets_ruby26(-)] >=dev-ruby/railties-5.0.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/activemodel-5.0.0[ruby_targets_ruby27(-)] >=dev-ruby/railties-5.0.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Create JSON structures via a Builder-style DSL
+EAPI=7
+HOMEPAGE=https://github.com/rails/jbuilder
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/activesupport-5.0.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/activesupport-5.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/activesupport-5.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://rubygems.org/gems/jbuilder-2.11.2.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6ee682fd2dc46f7ee378f40fdcd365d1
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.7 b/metadata/md5-cache/dev-ruby/mechanize-2.7.7
new file mode 100644
index 000000000000..415e40d8b3a2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.7.7
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby25(-)] test? ( dev-ruby/minitest:5[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby26(-)] test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ) test? ( ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby25(-)] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby25(-)] >=dev-ruby/net-http-persistent-2.5.2:*[ruby_targets_ruby25(-)] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby25(-)] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby25(-)] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby25(-)] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby25(-)] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby25(-)] >=dev-ruby/webrick-1.7:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby26(-)] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby26(-)] >=dev-ruby/net-http-persistent-2.5.2:*[ruby_targets_ruby26(-)] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby26(-)] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby26(-)] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby26(-)] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby26(-)] >=dev-ruby/webrick-1.7:0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+DESCRIPTION=A Ruby library used for automating interaction with websites
+EAPI=7
+HOMEPAGE=https://github.com/sparklemotion/mechanize
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby25(-)] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby25(-)] >=dev-ruby/net-http-persistent-2.5.2:*[ruby_targets_ruby25(-)] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby25(-)] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby25(-)] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby25(-)] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby25(-)] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby25(-)] >=dev-ruby/webrick-1.7:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby26(-)] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby26(-)] >=dev-ruby/net-http-persistent-2.5.2:*[ruby_targets_ruby26(-)] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby26(-)] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby26(-)] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby26(-)] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby26(-)] >=dev-ruby/webrick-1.7:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/mechanize-2.7.7.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f2c312a00d7a8c5354e6c9cdd563562d
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
index 5fd582ce2f3a..a3c6ccace68e 100644
--- a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
+++ b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/net-http-digest_auth-1.4.1.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=51b2fc548015a8b9d07bc31fd037fc74
+_md5_=f81ed009ca52ebc2aca5849bcd9cc522
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1
new file mode 100644
index 000000000000..baf10e88f142
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=An implementation of RFC 2617 - Digest Access Authentication
+EAPI=7
+HOMEPAGE=https://github.com/drbrain/net-http-digest_auth
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/net-http-digest_auth-1.4.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6ddfd1274226735fd63bdbad28624bac
diff --git a/metadata/md5-cache/dev-ruby/rake-13.0.3-r1 b/metadata/md5-cache/dev-ruby/rake-13.0.3-r1
new file mode 100644
index 000000000000..05ae7888ddf8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rake-13.0.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby30(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=app-arch/gzip ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Make-like scripting in Ruby
+EAPI=7
+HOMEPAGE=https://github.com/ruby/rake
+IUSE=doc ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby/rake/archive/v13.0.3.tar.gz -> rake-13.0.3.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=426d84cee3c7b5f198e7ed4298ac9ee2
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index c2c8faa402ed..c624e14efc5d 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/cbindgen-0.15.0 b/metadata/md5-cache/dev-util/cbindgen-0.15.0
deleted file mode 100644
index faf395922b13..000000000000
--- a/metadata/md5-cache/dev-util/cbindgen-0.15.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DESCRIPTION=A tool for generating C bindings to Rust code
-EAPI=7
-HOMEPAGE=https://github.com/eqrion/cbindgen/
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=MIT MPL-2.0
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cbindgen/0.15.0/download -> cbindgen-0.15.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.16/download -> hermit-abi-0.1.16.crate https://crates.io/api/v1/crates/indexmap/1.6.0/download -> indexmap-1.6.0.crate https://crates.io/api/v1/crates/itoa/0.4.6/download -> itoa-0.4.6.crate https://crates.io/api/v1/crates/libc/0.2.77/download -> libc-0.2.77.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.9/download -> ppv-lite86-0.2.9.crate https://crates.io/api/v1/crates/proc-macro2/1.0.21/download -> proc-macro2-1.0.21.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.116/download -> serde-1.0.116.crate https://crates.io/api/v1/crates/serde_derive/1.0.116/download -> serde_derive-1.0.116.crate https://crates.io/api/v1/crates/serde_json/1.0.57/download -> serde_json-1.0.57.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.41/download -> syn-1.0.41.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/toml/0.5.6/download -> toml-0.5.6.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	7ffdd252643addc68abff0a08cca5306	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8df4db668a7d489533870ffd71d3fb30
diff --git a/metadata/md5-cache/dev-util/cbindgen-0.16.0 b/metadata/md5-cache/dev-util/cbindgen-0.16.0
index eb8682441a77..9aa2b841a3cf 100644
--- a/metadata/md5-cache/dev-util/cbindgen-0.16.0
+++ b/metadata/md5-cache/dev-util/cbindgen-0.16.0
@@ -4,10 +4,10 @@ DESCRIPTION=A tool for generating C bindings to Rust code
 EAPI=7
 HOMEPAGE=https://github.com/eqrion/cbindgen/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=MIT MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cbindgen/0.16.0/download -> cbindgen-0.16.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.16/download -> hermit-abi-0.1.16.crate https://crates.io/api/v1/crates/indexmap/1.6.0/download -> indexmap-1.6.0.crate https://crates.io/api/v1/crates/itoa/0.4.6/download -> itoa-0.4.6.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.77/download -> libc-0.2.77.crate https://crates.io/api/v1/crates/lock_api/0.3.4/download -> lock_api-0.3.4.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/parking_lot/0.10.2/download -> parking_lot-0.10.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.7.2/download -> parking_lot_core-0.7.2.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.9/download -> ppv-lite86-0.2.9.crate https://crates.io/api/v1/crates/proc-macro2/1.0.21/download -> proc-macro2-1.0.21.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.116/download -> serde-1.0.116.crate https://crates.io/api/v1/crates/serde_derive/1.0.116/download -> serde_derive-1.0.116.crate https://crates.io/api/v1/crates/serde_json/1.0.57/download -> serde_json-1.0.57.crate https://crates.io/api/v1/crates/serial_test/0.5.0/download -> serial_test-0.5.0.crate https://crates.io/api/v1/crates/serial_test_derive/0.5.0/download -> serial_test_derive-0.5.0.crate https://crates.io/api/v1/crates/smallvec/1.4.2/download -> smallvec-1.4.2.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.41/download -> syn-1.0.41.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/toml/0.5.6/download -> toml-0.5.6.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
 _eclasses_=cargo	7ffdd252643addc68abff0a08cca5306	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8a195a3981a0be0098f90edfcbbdc144
+_md5_=f8dc88d77b6059bdf9148fffb2c8984e
diff --git a/metadata/md5-cache/dev-util/cmake-3.18.5 b/metadata/md5-cache/dev-util/cmake-3.18.5
index 657909b5f2f8..51104bf64e0e 100644
--- a/metadata/md5-cache/dev-util/cmake-3.18.5
+++ b/metadata/md5-cache/dev-util/cmake-3.18.5
@@ -5,11 +5,11 @@ DESCRIPTION=Cross platform Make
 EAPI=7
 HOMEPAGE=https://cmake.org/
 IUSE=doc emacs ncurses qt5 test test
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.18/cmake-3.18.5.tar.gz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b79ae07abeed38942e878975f3749418
+_md5_=fe5386047587c05373a95dab755279f2
diff --git a/metadata/md5-cache/dev-util/lttng-ust-2.12.0 b/metadata/md5-cache/dev-util/lttng-ust-2.12.0
index 0e6987c1ade8..007edd158075 100644
--- a/metadata/md5-cache/dev-util/lttng-ust-2.12.0
+++ b/metadata/md5-cache/dev-util/lttng-ust-2.12.0
@@ -5,10 +5,10 @@ DESCRIPTION=Linux Trace Toolkit - UST library
 EAPI=7
 HOMEPAGE=https://lttng.org
 IUSE=examples numa
-KEYWORDS=~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/userspace-rcu:= numa? ( sys-process/numactl )
 SLOT=0/2.12
 SRC_URI=https://lttng.org/files/lttng-ust/lttng-ust-2.12.0.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8edcd7abf1539a220e87f412ad68f085
+_md5_=534ae9de1893e53210be8119026fa9c9
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index d4dab27baf99..d700e91f1657 100644
Binary files a/metadata/md5-cache/gui-libs/Manifest.gz and b/metadata/md5-cache/gui-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-libs/display-manager-init-1.0 b/metadata/md5-cache/gui-libs/display-manager-init-1.0
index b4f1a8801c38..6c2142313e10 100644
--- a/metadata/md5-cache/gui-libs/display-manager-init-1.0
+++ b/metadata/md5-cache/gui-libs/display-manager-init-1.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=install preinst
 DESCRIPTION=RC init files for starting display and login managers
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:X11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions !<=sys-apps/sysvinit-2.98 !<=x11-apps/xinit-1.4.1 !<=x11-base/xorg-server-1.20.10
 SLOT=0
-_md5_=8d6733ac417fa0b15b7c0d4fe2c8837d
+_md5_=5b0bc76743af3baad1d3b293c9d44566
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 3000656beac2..1c88f223ed66 100644
Binary files a/metadata/md5-cache/kde-frameworks/Manifest.gz and b/metadata/md5-cache/kde-frameworks/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-frameworks/kdav-5.77.0-r1 b/metadata/md5-cache/kde-frameworks/kdav-5.77.0-r1
index f4fcd65be8e5..84877d874aab 100644
--- a/metadata/md5-cache/kde-frameworks/kdav-5.77.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kdav-5.77.0-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.77
 SRC_URI=mirror://kde/stable/frameworks/5.77/kdav-5.77.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	8a81008797ecdb979e3100d782ab5513	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b0407d6a49dd1db9847492087beb7579
+_md5_=7940c07f982b999aff5fdaf223f9e9d3
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 14ed9cd370e2..32d4f18a4a0b 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/alembic-1.7.16 b/metadata/md5-cache/media-gfx/alembic-1.7.16
index ccc9c23103f5..4db203981741 100644
--- a/metadata/md5-cache/media-gfx/alembic-1.7.16
+++ b/metadata/md5-cache/media-gfx/alembic-1.7.16
@@ -5,7 +5,7 @@ DESCRIPTION=Open framework for storing and sharing scene data
 EAPI=7
 HOMEPAGE=https://www.alembic.io/
 IUSE=hdf5 test zlib
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=media-libs/openexr-2.5.0:= hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] ) zlib? ( >=sys-libs/zlib-1.2.11-r1 )
 REQUIRED_USE=hdf5? ( zlib )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alembic/alembic/archive/1.7.16.tar.gz -> alembic-1.7.16.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2919d5054366582a986ca05cb4ef8046
+_md5_=732266ef680bf6a30ace68a6b68e07e7
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.60 b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.60
index d1483d0e88cc..6a8b375a49bf 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.60
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.60
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=6
 HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/6.9.11-37
 SRC_URI=mirror://imagemagick/ImageMagick-6.9.11-60.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f9645b220af8ce12e515f815d1966347
+_md5_=4d0dd1d7f9c4333fcb59ca283bca4cf0
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.58 b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.61
similarity index 90%
rename from metadata/md5-cache/media-gfx/imagemagick-6.9.11.58
rename to metadata/md5-cache/media-gfx/imagemagick-6.9.11.61
index 504a9e59dbd7..34a810b5c763 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.58
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.61
@@ -3,13 +3,13 @@ DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/cor
 DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=6
 HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
 RESTRICT=!test? ( test )
 SLOT=0/6.9.11-37
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.11-58.tar.xz
+SRC_URI=mirror://imagemagick/ImageMagick-6.9.11-61.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4d0dd1d7f9c4333fcb59ca283bca4cf0
+_md5_=91e82aa6e4f50dd95debae961c5e4555
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.60 b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.60
index 7aa53d1e911d..bd8601d31ca6 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.60
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.60
@@ -5,7 +5,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=7
 HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/7.0.10-37
 SRC_URI=mirror://imagemagick/ImageMagick-7.0.10-60.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=35185accac99c774b736b2ff3190760f
+_md5_=5fd769316b48db0fd3750d506e5a7c0a
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.58 b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.61
similarity index 89%
rename from metadata/md5-cache/media-gfx/imagemagick-7.0.10.58
rename to metadata/md5-cache/media-gfx/imagemagick-7.0.10.61
index 4532f3b52c45..ea08e5a7e1ac 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.58
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.61
@@ -4,13 +4,13 @@ DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/cor
 DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=7
 HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
 RESTRICT=!test? ( test )
 SLOT=0/7.0.10-37
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.10-58.tar.xz
+SRC_URI=mirror://imagemagick/ImageMagick-7.0.10-61.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5fd769316b48db0fd3750d506e5a7c0a
+_md5_=8ccd032d65336ebc0ec1422f1935d52e
diff --git a/metadata/md5-cache/media-gfx/imagemagick-9999 b/metadata/md5-cache/media-gfx/imagemagick-9999
index 1660049f9265..354049aadc3f 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-9999
+++ b/metadata/md5-cache/media-gfx/imagemagick-9999
@@ -4,7 +4,7 @@ DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/cor
 DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=7
 HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
 LICENSE=imagemagick
 PROPERTIES=live
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
@@ -12,4 +12,4 @@ REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
 RESTRICT=!test? ( test )
 SLOT=0/7.0.10-37
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=35185accac99c774b736b2ff3190760f
+_md5_=8ccd032d65336ebc0ec1422f1935d52e
diff --git a/metadata/md5-cache/media-gfx/pngcheck-3.0.2 b/metadata/md5-cache/media-gfx/pngcheck-3.0.2
new file mode 100644
index 000000000000..d062a5865d3d
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/pngcheck-3.0.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=sys-libs/zlib
+DESCRIPTION=Verifies the integrity of PNG, JNG and MNG files with internal checksums
+EAPI=7
+HOMEPAGE=http://www.libpng.org/pub/png/apps/pngcheck.html
+KEYWORDS=~amd64 ~x86
+LICENSE=HPND GPL-2+
+RDEPEND=sys-libs/zlib
+SLOT=0
+SRC_URI=mirror://sourceforge/png-mng/pngcheck-3.0.2.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2ed43cb38378e8483d0bc1e74f5be36e
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 90f8e0b7895d..d0cafbb7528b 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/gavl-1.4.0-r2 b/metadata/md5-cache/media-libs/gavl-1.4.0-r2
index 808d6c901407..b1d0539346f8 100644
--- a/metadata/md5-cache/media-libs/gavl-1.4.0-r2
+++ b/metadata/md5-cache/media-libs/gavl-1.4.0-r2
@@ -4,9 +4,9 @@ DESCRIPTION=Library for handling uncompressed audio and video data
 EAPI=7
 HOMEPAGE=http://gmerlin.sourceforge.net
 IUSE=doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/gmerlin/gavl-1.4.0.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3248d87640021b04d3fad3ab74e6eab0
+_md5_=257daffed030367d3b20abf318211bd0
diff --git a/metadata/md5-cache/media-libs/libbdplus-0.1.2 b/metadata/md5-cache/media-libs/libbdplus-0.1.2
deleted file mode 100644
index a81780280ce5..000000000000
--- a/metadata/md5-cache/media-libs/libbdplus-0.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libgpg-error[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aacs? ( >=media-libs/libaacs-0.7.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170815
-DESCRIPTION=Blu-ray library for BD+ decryption
-EAPI=5
-HOMEPAGE=https://www.videolan.org/developers/libbdplus.html
-IUSE=aacs static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libgpg-error[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aacs? ( >=media-libs/libaacs-0.7.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://downloads.videolan.org/pub/videolan/libbdplus/0.1.2/libbdplus-0.1.2.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-multilib	9c600605e4462da7f90f41008447ba1c	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7dae1fa2e87fd02ce9a61766174cf13f
diff --git a/metadata/md5-cache/media-libs/libbdplus-0.1.2-r1 b/metadata/md5-cache/media-libs/libbdplus-0.1.2-r1
index cf40bb68de3d..a1c9007ca174 100644
--- a/metadata/md5-cache/media-libs/libbdplus-0.1.2-r1
+++ b/metadata/md5-cache/media-libs/libbdplus-0.1.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Blu-ray library for BD+ decryption
 EAPI=7
 HOMEPAGE=https://www.videolan.org/developers/libbdplus.html
 IUSE=aacs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~ppc ppc64 sparc x86
+KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libgpg-error[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aacs? ( >=media-libs/libaacs-0.7.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://downloads.videolan.org/pub/videolan/libbdplus/0.1.2/libbdplus-0.1.2.tar.bz2
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ae1a86ae730a9155d86e1e33c40f76f9
+_md5_=2f2b0d6932d745ed5b40d1a4516c228d
diff --git a/metadata/md5-cache/media-libs/libde265-1.0.8 b/metadata/md5-cache/media-libs/libde265-1.0.8
index f1d83ab552c3..d6c92924d7cb 100644
--- a/metadata/md5-cache/media-libs/libde265-1.0.8
+++ b/metadata/md5-cache/media-libs/libde265-1.0.8
@@ -5,10 +5,10 @@ DESCRIPTION=Open h.265 video codec implementation
 EAPI=7
 HOMEPAGE=https://github.com/strukturag/libde265
 IUSE=enc265 dec265 sdl tools debug cpu_flags_x86_sse4_1 cpu_flags_arm_neon cpu_flags_arm_thumb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=dec265? ( sdl? ( media-libs/libsdl ) )
 SLOT=0
 SRC_URI=https://github.com/strukturag/libde265/archive/v1.0.8.tar.gz -> libde265-1.0.8.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e51303e685f23b750c894e28bb5a7f1d
+_md5_=bd542d89f4a1acafe2e53a6c907f713f
diff --git a/metadata/md5-cache/media-libs/libfame-0.9.1-r3 b/metadata/md5-cache/media-libs/libfame-0.9.1-r3
index 5cf65a0597e1..da79840f5646 100644
--- a/metadata/md5-cache/media-libs/libfame-0.9.1-r3
+++ b/metadata/md5-cache/media-libs/libfame-0.9.1-r3
@@ -4,9 +4,9 @@ DESCRIPTION=MPEG-1 and MPEG-4 video encoding library
 EAPI=7
 HOMEPAGE=http://fame.sourceforge.net/
 IUSE=cpu_flags_x86_mmx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/fame/libfame-0.9.1.tar.gz http://digilander.libero.it/dgp85/gentoo/libfame-patches-2.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7f23d53edc185a544936b6b92aad1126
+_md5_=c29b50aa4577aed74e4da98663c20dca
diff --git a/metadata/md5-cache/media-libs/libiec61883-1.2.0-r2 b/metadata/md5-cache/media-libs/libiec61883-1.2.0-r2
index 22b4f09fb33b..6b18556d0918 100644
--- a/metadata/md5-cache/media-libs/libiec61883-1.2.0-r2
+++ b/metadata/md5-cache/media-libs/libiec61883-1.2.0-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Library for capturing video (dv or mpeg2) over the IEEE 1394 bus
 EAPI=7
 HOMEPAGE=https://ieee1394.wiki.kernel.org/index.php/Libraries#libiec61883
 IUSE=examples abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc ~x86
 LICENSE=|| ( LGPL-2.1 GPL-2 )
 RDEPEND=>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/libs/ieee1394/libiec61883-1.2.0.tar.xz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=86c55bd32f3a67147bf262860cc69eb3
+_md5_=d5c2b4d975fcf19b886724198d8d8de7
diff --git a/metadata/md5-cache/media-libs/libilbc-3.0.4 b/metadata/md5-cache/media-libs/libilbc-3.0.4
index 12803b3c7b28..0f3ff56aac90 100644
--- a/metadata/md5-cache/media-libs/libilbc-3.0.4
+++ b/metadata/md5-cache/media-libs/libilbc-3.0.4
@@ -4,9 +4,9 @@ DESCRIPTION=Packaged version of iLBC codec from the WebRTC project
 EAPI=7
 HOMEPAGE=https://github.com/TimothyGu/libilbc
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 ~sparc ~x86
 LICENSE=BSD
 SLOT=0/3
 SRC_URI=https://github.com/TimothyGu/libilbc/releases/download/v3.0.4/libilbc-3.0.4.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ffae342fbdef2f4450abdfa814cdceb0
+_md5_=a5f9efa45a46b4e3be2b51b63a4f524b
diff --git a/metadata/md5-cache/media-libs/libmms-0.6.4-r1 b/metadata/md5-cache/media-libs/libmms-0.6.4-r1
index 66ebe6dd3a6c..1749259716ca 100644
--- a/metadata/md5-cache/media-libs/libmms-0.6.4-r1
+++ b/metadata/md5-cache/media-libs/libmms-0.6.4-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Library for accessing Microsoft Media Server (MMS) media streaming p
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/libmms/ https://launchpad.net/libmms/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/libmms/libmms-0.6.4.tar.gz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8bb8fda01ee71f6fa2f5ebc7cb4af1c1
+_md5_=3b576107dd8d7e4d7bc045806b68c81e
diff --git a/metadata/md5-cache/media-libs/libmodplug-0.8.9.0-r1 b/metadata/md5-cache/media-libs/libmodplug-0.8.9.0-r1
index 0c23666614f5..5a7236d33c15 100644
--- a/metadata/md5-cache/media-libs/libmodplug-0.8.9.0-r1
+++ b/metadata/md5-cache/media-libs/libmodplug-0.8.9.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Library for playing MOD-like music files
 EAPI=7
 HOMEPAGE=http://modplug-xmms.sourceforge.net/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/modplug-xmms/libmodplug-0.8.9.0.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0ce0dd4c6c7d27bb3265f1c6377c63ea
+_md5_=71651b28c98f141e95c2258f03a49fde
diff --git a/metadata/md5-cache/media-libs/libmpeg2-0.5.1-r3 b/metadata/md5-cache/media-libs/libmpeg2-0.5.1-r3
index d5a94eb12cc0..4b0b955a8903 100644
--- a/metadata/md5-cache/media-libs/libmpeg2-0.5.1-r3
+++ b/metadata/md5-cache/media-libs/libmpeg2-0.5.1-r3
@@ -5,10 +5,10 @@ DESCRIPTION=Library for decoding mpeg-2 and mpeg-1 video
 EAPI=7
 HOMEPAGE=https://libmpeg2.sourceforge.io/
 IUSE=sdl X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sdl? ( media-libs/libsdl ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXt x11-libs/libXv )
 SLOT=0
 SRC_URI=http://libmpeg2.sourceforge.net/files/libmpeg2-0.5.1.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=dfd62faaf2d4d098c7993ba6d10dc78e
+_md5_=64d2653a51062d3890cb73729906ccc4
diff --git a/metadata/md5-cache/media-libs/libmtp-1.1.18 b/metadata/md5-cache/media-libs/libmtp-1.1.18
index 9c351667820f..be5b98577e8d 100644
--- a/metadata/md5-cache/media-libs/libmtp-1.1.18
+++ b/metadata/md5-cache/media-libs/libmtp-1.1.18
@@ -5,10 +5,10 @@ DESCRIPTION=Implementation of Microsoft's Media Transfer Protocol (MTP)
 EAPI=7
 HOMEPAGE=http://libmtp.sourceforge.net/
 IUSE=+crypt doc examples static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=acct-group/plugdev virtual/libiconv virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
 SLOT=0/9
 SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.18.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=a8057dbf1112832dc63e70d7a5c7e79e
+_md5_=7a4b14a2e109dd83d5a5e089981abdb9
diff --git a/metadata/md5-cache/media-libs/libopenraw-0.1.3 b/metadata/md5-cache/media-libs/libopenraw-0.1.3
index e5c628b28f7f..5bc394bfb4fd 100644
--- a/metadata/md5-cache/media-libs/libopenraw-0.1.3
+++ b/metadata/md5-cache/media-libs/libopenraw-0.1.3
@@ -1,14 +1,15 @@
+BDEPEND=virtual/pkgconfig test? ( net-misc/curl )
 DEFINED_PHASES=configure install postinst postrm preinst
-DEPEND=dev-libs/libxml2 virtual/jpeg:0 gtk? ( dev-libs/glib:2 >=x11-libs/gdk-pixbuf-2.24.0:2 ) >=dev-libs/boost-1.35 virtual/pkgconfig test? ( net-misc/curl )
-DESCRIPTION=A decoding library for RAW image formats
-EAPI=6
-HOMEPAGE=https://libopenraw.freedesktop.org/wiki/
-IUSE=gtk static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+DEPEND=dev-libs/libxml2 virtual/jpeg:0 gtk? ( dev-libs/glib:2 >=x11-libs/gdk-pixbuf-2.24.0:2 ) >=dev-libs/boost-1.35
+DESCRIPTION=RAW image formats decoding library
+EAPI=7
+HOMEPAGE=https://libopenraw.freedesktop.org/
+IUSE=gtk test
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-libs/libxml2 virtual/jpeg:0 gtk? ( dev-libs/glib:2 >=x11-libs/gdk-pixbuf-2.24.0:2 )
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://libopenraw.freedesktop.org/download/libopenraw-0.1.3.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d07ff753dcb90670fb76d39826750c2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=87e7a66e82e08bb75c24335085d749bb
diff --git a/metadata/md5-cache/media-libs/openal-1.21.0 b/metadata/md5-cache/media-libs/openal-1.21.0
index 13da517491da..b61feef83022 100644
--- a/metadata/md5-cache/media-libs/openal-1.21.0
+++ b/metadata/md5-cache/media-libs/openal-1.21.0
@@ -5,10 +5,10 @@ DESCRIPTION=A software implementation of the OpenAL 3D audio API
 EAPI=7
 HOMEPAGE=https://www.openal-soft.org/
 IUSE=alsa coreaudio debug jack oss portaudio pulseaudio sdl qt5 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2+
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://www.openal-soft.org/openal-releases/openal-soft-1.21.0.tar.bz2
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=104ca51fcba559bc441215d33ebb71c2
+_md5_=dba840f41214c7ae790c18e89a557dba
diff --git a/metadata/md5-cache/media-libs/opencore-amr-0.1.5-r1 b/metadata/md5-cache/media-libs/opencore-amr-0.1.5-r1
index 60e8c482c4c9..0622daf0c846 100644
--- a/metadata/md5-cache/media-libs/opencore-amr-0.1.5-r1
+++ b/metadata/md5-cache/media-libs/opencore-amr-0.1.5-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Implementation of Adaptive Multi Rate Narrowband and Wideband speech
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/opencore-amr/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/opencore-amr/opencore-amr-0.1.5.tar.gz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b737bf11e95d2fb804ff41e1c539524b
+_md5_=d78b85cadc365fde50cf97a6053a5037
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 19626f301d08..7713d205ea00 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-demo-7.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-demo-7.0.0
deleted file mode 100644
index 75deb8ac8876..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-demo-7.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml
-DESCRIPTION=Demo PVR for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.demo
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.demo/archive/7.0.0-Matrix.tar.gz -> kodi-pvr-demo-7.0.0.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ae5a1a8d39f453d14051dc93ecf04d21
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-demo-6.0.1 b/metadata/md5-cache/media-plugins/kodi-pvr-demo-7.1.0
similarity index 85%
rename from metadata/md5-cache/media-plugins/kodi-pvr-demo-6.0.1
rename to metadata/md5-cache/media-plugins/kodi-pvr-demo-7.1.0
index 570313a2c0d1..d3c73904b658 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-demo-6.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-demo-7.1.0
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
 SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.demo/archive/6.0.1-Matrix.tar.gz -> kodi-pvr-demo-6.0.1.tar.gz
+SRC_URI=https://github.com/kodi-pvr/pvr.demo/archive/7.1.0-Matrix.tar.gz -> kodi-pvr-demo-7.1.0.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ae5a1a8d39f453d14051dc93ecf04d21
+_md5_=ade8c58ea09056b637c7f963f6d6f9f9
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 909fcead937f..bc9a28262c54 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/pulseaudio-13.0-r1 b/metadata/md5-cache/media-sound/pulseaudio-13.0-r1
index 8993f4049e31..37fc0061fc10 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-13.0-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-13.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A networked sound server with an advanced plugin system
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
 IUSE=+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf +gdbm +glib gtk ipv6 jack libsamplerate libressl lirc native-headset cpu_flags_arm_neon ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
 PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-libs/libpcre ) >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libICE[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) caps? ( >=sys-libs/libcap-2.22-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.26.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( virtual/jack ) tcpd? ( sys-apps/tcp-wrappers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:3 ) bluetooth? ( >=net-wireless/bluez-5 >=sys-apps/dbus-1.0.0 media-libs/sbc ) asyncns? ( net-libs/libasyncns[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/udev-143[hwdb(+)] ) equalizer? ( sci-libs/fftw:3.0 ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) media-libs/speexdsp gdbm? ( sys-libs/gdbm:= ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/libltdl:0 selinux? ( sec-policy/selinux-pulseaudio ) realtime? ( sys-auth/rtkit ) gconf? ( >=gnome-base/gconf-3.2.6 ) equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) ) system-wide? ( alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-5 ) acct-user/pulse acct-group/pulse-access ) acct-group/audio
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-13.0.tar.xz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e3823d8a38486eea927a3f0f7f147b59
+_md5_=0e2e90437c004a2021a90d50d452fcdb
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 039813ffe623..83bef7867953 100644
Binary files a/metadata/md5-cache/media-tv/Manifest.gz and b/metadata/md5-cache/media-tv/Manifest.gz differ
diff --git a/metadata/md5-cache/media-tv/kodi-19.0_beta2_p20210112 b/metadata/md5-cache/media-tv/kodi-19.0_beta2_p20210112
deleted file mode 100644
index e7a76d29d432..000000000000
--- a/metadata/md5-cache/media-tv/kodi-19.0_beta2_p20210112
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) >=dev-libs/libcdio-2.1.0 >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto media-libs/dav1d >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.1:=[dav1d,encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= test? ( >=dev-cpp/gtest-1.10.0 ) virtual/pkgconfig virtual/jre x86? ( dev-lang/nasm ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A free and open source media-player and entertainment hub
-EAPI=7
-HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
-IUSE=airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf kernel_linux python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) >=dev-libs/libcdio-2.1.0 >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto media-libs/dav1d >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.1:=[dav1d,encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( gles opengl ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.1-Matrix-Beta1.tar.gz -> ffmpeg-kodi-4.3.1-Matrix-Beta1.tar.gz ) https://github.com/xbmc/xbmc/archive/aecf662b642fef7fd8388135bd23d842094f0690.tar.gz -> kodi-19.0_beta2_p20210112.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3ea7e4d52b948cbfdeaf59603e827254
diff --git a/metadata/md5-cache/media-tv/kodi-19.0_rc1 b/metadata/md5-cache/media-tv/kodi-19.0_rc1
deleted file mode 100644
index 67c93d735a70..000000000000
--- a/metadata/md5-cache/media-tv/kodi-19.0_rc1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) >=dev-libs/libcdio-2.1.0 >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto media-libs/dav1d >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.1:=[dav1d,encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= test? ( >=dev-cpp/gtest-1.10.0 ) virtual/pkgconfig virtual/jre x86? ( dev-lang/nasm ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A free and open source media-player and entertainment hub
-EAPI=7
-HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
-IUSE=airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf kernel_linux python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) >=dev-libs/libcdio-2.1.0 >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto media-libs/dav1d >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.1:=[dav1d,encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( gles opengl ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.1-Matrix-Beta1.tar.gz -> ffmpeg-kodi-4.3.1-Matrix-Beta1.tar.gz ) https://github.com/xbmc/xbmc/archive/19.0RC1-Matrix.tar.gz -> kodi-19.0RC1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=526d363f4478828c2099f071cbce9bbe
diff --git a/metadata/md5-cache/media-tv/kodi-19.0_rc1-r2 b/metadata/md5-cache/media-tv/kodi-19.0_rc1-r2
new file mode 100644
index 000000000000..8161cb3631ba
--- /dev/null
+++ b/metadata/md5-cache/media-tv/kodi-19.0_rc1-r2
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) cdio? ( >=dev-libs/libcdio-2.1.0 ) >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.1:=[dav1d?,encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) !system-ffmpeg? ( dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= test? ( >=dev-cpp/gtest-1.10.0 ) virtual/pkgconfig virtual/jre x86? ( dev-lang/nasm ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A free and open source media-player and entertainment hub
+EAPI=7
+HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
+IUSE=airplay alsa bluetooth bluray caps cdio cec +css dav1d dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon kernel_linux python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) cdio? ( >=dev-libs/libcdio-2.1.0 ) >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.1:=[dav1d?,encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) !system-ffmpeg? ( dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( gles opengl ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus ) power-control? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.1-Matrix-Beta1.tar.gz -> ffmpeg-kodi-4.3.1-Matrix-Beta1.tar.gz ) https://github.com/xbmc/xbmc/archive/19.0RC1-Matrix.tar.gz -> kodi-19.0RC1.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1afebb291ff8b2cc363d2fc6fa5d43e9
diff --git a/metadata/md5-cache/media-tv/kodi-19.9999 b/metadata/md5-cache/media-tv/kodi-19.9999
index 753e8739cbbc..0b0e591e9b89 100644
--- a/metadata/md5-cache/media-tv/kodi-19.9999
+++ b/metadata/md5-cache/media-tv/kodi-19.9999
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) >=dev-libs/libcdio-2.1.0 >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto media-libs/dav1d >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.1:=[dav1d,encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= test? ( >=dev-cpp/gtest-1.10.0 ) virtual/pkgconfig virtual/jre x86? ( dev-lang/nasm ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) cdio? ( >=dev-libs/libcdio-2.1.0 ) >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.1:=[dav1d?,encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) !system-ffmpeg? ( dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= test? ( >=dev-cpp/gtest-1.10.0 ) virtual/pkgconfig virtual/jre x86? ( dev-lang/nasm ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A free and open source media-player and entertainment hub
 EAPI=7
 HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
-IUSE=airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf kernel_linux python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+IUSE=airplay alsa bluetooth bluray caps cdio cec +css dav1d dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon kernel_linux python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) >=dev-libs/libcdio-2.1.0 >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto media-libs/dav1d >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.1:=[dav1d,encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( gles opengl ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) cdio? ( >=dev-libs/libcdio-2.1.0 ) >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.1:=[dav1d?,encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) !system-ffmpeg? ( dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( gles opengl ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus ) power-control? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.1-Matrix-Beta1.tar.gz -> ffmpeg-kodi-4.3.1-Matrix-Beta1.tar.gz )
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=526d363f4478828c2099f071cbce9bbe
+_md5_=1afebb291ff8b2cc363d2fc6fa5d43e9
diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index 753e8739cbbc..0b0e591e9b89 100644
--- a/metadata/md5-cache/media-tv/kodi-9999
+++ b/metadata/md5-cache/media-tv/kodi-9999
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) >=dev-libs/libcdio-2.1.0 >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto media-libs/dav1d >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.1:=[dav1d,encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= test? ( >=dev-cpp/gtest-1.10.0 ) virtual/pkgconfig virtual/jre x86? ( dev-lang/nasm ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) cdio? ( >=dev-libs/libcdio-2.1.0 ) >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.1:=[dav1d?,encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) !system-ffmpeg? ( dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= test? ( >=dev-cpp/gtest-1.10.0 ) virtual/pkgconfig virtual/jre x86? ( dev-lang/nasm ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A free and open source media-player and entertainment hub
 EAPI=7
 HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
-IUSE=airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf kernel_linux python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+IUSE=airplay alsa bluetooth bluray caps cdio cec +css dav1d dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon kernel_linux python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) >=dev-libs/libcdio-2.1.0 >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto media-libs/dav1d >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.1:=[dav1d,encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( gles opengl ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) cdio? ( >=dev-libs/libcdio-2.1.0 ) >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.1:=[dav1d?,encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) !system-ffmpeg? ( dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( gles opengl ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus ) power-control? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.1-Matrix-Beta1.tar.gz -> ffmpeg-kodi-4.3.1-Matrix-Beta1.tar.gz )
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=526d363f4478828c2099f071cbce9bbe
+_md5_=1afebb291ff8b2cc363d2fc6fa5d43e9
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index a80e53fff2ac..4cde441e46bf 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/google2srt-0.5.6-r1 b/metadata/md5-cache/media-video/google2srt-0.5.6-r1
index ce35b41f8063..bcbac73cc98d 100644
--- a/metadata/md5-cache/media-video/google2srt-0.5.6-r1
+++ b/metadata/md5-cache/media-video/google2srt-0.5.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/jdom:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=app-arch/unzip >=virtual/jdk-1.6 dev-java/jdom:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=Convert subtitles from Google Video and YouTube to SubRip (.srt) format
 EAPI=5
 HOMEPAGE=http://google2srt.sourceforge.net/en/
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.6 dev-java/jdom:0 >=dev-java/java-config-2.2.0-r3 source
 SLOT=0
 SRC_URI=mirror://sourceforge/google2srt/Google2SRT-0.5.6.zip http://sbriesen.de/gentoo/distfiles/google2srt-icon.png
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f180433d7c7ca38661519c119c5b10e8
+_md5_=2c4ab55aae8a71ae03ac353823847f8d
diff --git a/metadata/md5-cache/media-video/rav1e-0.3.5 b/metadata/md5-cache/media-video/rav1e-0.3.5
index 5b154679bb61..c3292f2fff37 100644
--- a/metadata/md5-cache/media-video/rav1e-0.3.5
+++ b/metadata/md5-cache/media-video/rav1e-0.3.5
@@ -5,10 +5,10 @@ DESCRIPTION=The fastest and safest AV1 encoder
 EAPI=7
 HOMEPAGE=https://github.com/xiph/rav1e/
 IUSE=+capi debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc64 ~x86
 LICENSE=BSD-2 Apache-2.0 MIT Unlicense
 RDEPEND=capi? ( dev-util/cargo-c )
 SLOT=0
 SRC_URI=https://github.com/xiph/rav1e/archive/v0.3.5.tar.gz -> rav1e-0.3.5.tar.gz https://crates.io/api/v1/crates/addr2line/0.14.1/download -> addr2line-0.14.1.crate https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/aom-sys/0.2.1/download -> aom-sys-0.2.1.crate https://crates.io/api/v1/crates/arbitrary/0.2.0/download -> arbitrary-0.2.0.crate https://crates.io/api/v1/crates/arg_enum_proc_macro/0.3.0/download -> arg_enum_proc_macro-0.3.0.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/assert_cmd/1.0.2/download -> assert_cmd-1.0.2.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/backtrace/0.3.55/download -> backtrace-0.3.55.crate https://crates.io/api/v1/crates/bindgen/0.54.0/download -> bindgen-0.54.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitstream-io/0.8.5/download -> bitstream-io-0.8.5.crate https://crates.io/api/v1/crates/bstr/0.2.14/download -> bstr-0.2.14.crate https://crates.io/api/v1/crates/bumpalo/3.4.0/download -> bumpalo-3.4.0.crate https://crates.io/api/v1/crates/bytemuck/1.4.1/download -> bytemuck-1.4.1.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cast/0.2.3/download -> cast-0.2.3.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cexpr/0.4.0/download -> cexpr-0.4.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clang-sys/0.29.3/download -> clang-sys-0.29.3.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cmake/0.1.45/download -> cmake-0.1.45.crate https://crates.io/api/v1/crates/color_quant/1.1.0/download -> color_quant-1.1.0.crate https://crates.io/api/v1/crates/console/0.11.3/download -> console-0.11.3.crate https://crates.io/api/v1/crates/const_fn/0.4.4/download -> const_fn-0.4.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/criterion/0.3.3/download -> criterion-0.3.3.crate https://crates.io/api/v1/crates/criterion-plot/0.4.3/download -> criterion-plot-0.4.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.0/download -> crossbeam-channel-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.0/download -> crossbeam-deque-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.1/download -> crossbeam-epoch-0.9.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.1/download -> crossbeam-utils-0.8.1.crate https://crates.io/api/v1/crates/csv/1.1.5/download -> csv-1.1.5.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/ctor/0.1.17/download -> ctor-0.1.17.crate https://crates.io/api/v1/crates/dav1d-sys/0.3.2/download -> dav1d-sys-0.3.2.crate https://crates.io/api/v1/crates/deflate/0.8.6/download -> deflate-0.8.6.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/error-chain/0.10.0/download -> error-chain-0.10.0.crate https://crates.io/api/v1/crates/fern/0.6.0/download -> fern-0.6.0.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/gimli/0.23.0/download -> gimli-0.23.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/half/1.6.0/download -> half-1.6.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/image/0.23.12/download -> image-0.23.12.crate https://crates.io/api/v1/crates/interpolate_name/0.2.3/download -> interpolate_name-0.2.3.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/js-sys/0.3.46/download -> js-sys-0.3.46.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.81/download -> libc-0.2.81.crate https://crates.io/api/v1/crates/libloading/0.5.2/download -> libloading-0.5.2.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memoffset/0.6.1/download -> memoffset-0.6.1.crate https://crates.io/api/v1/crates/metadeps/1.1.2/download -> metadeps-1.1.2.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.3/download -> miniz_oxide-0.4.3.crate https://crates.io/api/v1/crates/nasm-rs/0.2.0/download -> nasm-rs-0.2.0.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/noop_proc_macro/0.2.1/download -> noop_proc_macro-0.2.1.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/num-derive/0.3.3/download -> num-derive-0.3.3.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/object/0.22.0/download -> object-0.22.0.crate https://crates.io/api/v1/crates/oorandom/11.1.3/download -> oorandom-11.1.3.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plotters/0.2.15/download -> plotters-0.2.15.crate https://crates.io/api/v1/crates/png/0.16.8/download -> png-0.16.8.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/predicates/1.0.6/download -> predicates-1.0.6.crate https://crates.io/api/v1/crates/predicates-core/1.0.1/download -> predicates-core-1.0.1.crate https://crates.io/api/v1/crates/predicates-tree/1.0.1/download -> predicates-tree-1.0.1.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.8/download -> quote-1.0.8.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rayon/1.5.0/download -> rayon-1.5.0.crate https://crates.io/api/v1/crates/rayon-core/1.9.0/download -> rayon-core-1.9.0.crate https://crates.io/api/v1/crates/regex/1.4.2/download -> regex-1.4.2.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.21/download -> regex-syntax-0.6.21.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.18/download -> rustc-demangle-0.1.18.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rust_hawktracer/0.7.0/download -> rust_hawktracer-0.7.0.crate https://crates.io/api/v1/crates/rust_hawktracer_normal_macro/0.4.1/download -> rust_hawktracer_normal_macro-0.4.1.crate https://crates.io/api/v1/crates/rust_hawktracer_proc_macro/0.4.1/download -> rust_hawktracer_proc_macro-0.4.1.crate https://crates.io/api/v1/crates/rust_hawktracer_sys/0.4.2/download -> rust_hawktracer_sys-0.4.2.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scan_fmt/0.2.5/download -> scan_fmt-0.2.5.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.118/download -> serde-1.0.118.crate https://crates.io/api/v1/crates/serde_cbor/0.11.1/download -> serde_cbor-0.11.1.crate https://crates.io/api/v1/crates/serde_derive/1.0.118/download -> serde_derive-1.0.118.crate https://crates.io/api/v1/crates/serde_json/1.0.61/download -> serde_json-1.0.61.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.crate https://crates.io/api/v1/crates/signal-hook-registry/1.3.0/download -> signal-hook-registry-1.3.0.crate https://crates.io/api/v1/crates/simd_helpers/0.1.0/download -> simd_helpers-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.56/download -> syn-1.0.56.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/terminal_size/0.1.15/download -> terminal_size-0.1.15.crate https://crates.io/api/v1/crates/termios/0.3.3/download -> termios-0.3.3.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.23/download -> thiserror-1.0.23.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.23/download -> thiserror-impl-1.0.23.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/tinytemplate/1.1.0/download -> tinytemplate-1.1.0.crate https://crates.io/api/v1/crates/toml/0.2.1/download -> toml-0.2.1.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.69/download -> wasm-bindgen-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.69/download -> wasm-bindgen-backend-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.69/download -> wasm-bindgen-macro-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.69/download -> wasm-bindgen-macro-support-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.69/download -> wasm-bindgen-shared-0.2.69.crate https://crates.io/api/v1/crates/web-sys/0.3.46/download -> web-sys-0.3.46.crate https://crates.io/api/v1/crates/which/3.1.1/download -> which-3.1.1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/y4m/0.5.3/download -> y4m-0.5.3.crate
 _eclasses_=cargo	7ffdd252643addc68abff0a08cca5306	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d2105014c0847e7b38ed8f7b6e41935d
+_md5_=accb63cda43c446120c15cdfd84f7b44
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index d925f2c11c6f..aab144ce381b 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/gensink-4.1-r2 b/metadata/md5-cache/net-analyzer/gensink-4.1-r2
index 7ce07c0a289b..00257c0efeb5 100644
--- a/metadata/md5-cache/net-analyzer/gensink-4.1-r2
+++ b/metadata/md5-cache/net-analyzer/gensink-4.1-r2
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile configure install prepare unpack
+DEFINED_PHASES=compile install
 DESCRIPTION=A simple TCP benchmark suite
-EAPI=5
+EAPI=7
 HOMEPAGE=http://jes.home.cern.ch/jes/gensink/
 KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://jes.home.cern.ch/jes/gensink/gensink-4.1.tar.gz
-_eclasses_=base	a3f380d8a13f148f16d76fe39e90f451	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f58f15d17bbb7757ffb3afc914f8730d
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6e1724fc57039782674267c39a9030c6
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.7 b/metadata/md5-cache/net-analyzer/zabbix-5.0.7
index 52de2705809f..6402f76b7588 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.7
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.7
@@ -5,11 +5,11 @@ DESCRIPTION=ZABBIX is software for monitoring of your applications, network and
 EAPI=7
 HOMEPAGE=https://www.zabbix.com/
 IUSE=+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
 SLOT=0/5.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.7.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	webapp	1d03df021d958f89f4cc78e289d0b116	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e2bfbb51f45fe7e5a72fbdf7310782cb
+_md5_=679c74c5532a01d54ffcf8db359828fa
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.2.3 b/metadata/md5-cache/net-analyzer/zabbix-5.2.3
index 2e22d3862331..a8eccfe95234 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.2.3
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.2.3
@@ -5,11 +5,11 @@ DESCRIPTION=ZABBIX is software for monitoring of your applications, network and
 EAPI=7
 HOMEPAGE=https://www.zabbix.com/
 IUSE=+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
 SLOT=0/5.2
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.2/zabbix-5.2.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	webapp	1d03df021d958f89f4cc78e289d0b116	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e2bfbb51f45fe7e5a72fbdf7310782cb
+_md5_=679c74c5532a01d54ffcf8db359828fa
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index a18ff62c0a18..1382c5898c0d 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r1 b/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r1
deleted file mode 100644
index 1a70c7987320..000000000000
--- a/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst setup test
-DEPEND=test? ( net-dns/bind-tools ) virtual/pkgconfig
-DESCRIPTION=Proxy DNS server with permanent caching
-EAPI=5
-HOMEPAGE=http://members.home.nl/p.a.rombouts/pdnsd/
-IUSE=debug ipv6 isdn +urandom test
-KEYWORDS=~alpha amd64 arm ~ia64 ppc ~s390 sparc x86
-LICENSE=GPL-3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-1.2.9a-par.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=7ca726485f781af99f5b82564343ebf7
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 9ee0ab6dbdbd..e95b85702a6e 100644
Binary files a/metadata/md5-cache/net-fs/Manifest.gz and b/metadata/md5-cache/net-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-fs/davfs2-1.6.0 b/metadata/md5-cache/net-fs/davfs2-1.6.0
index 355a3061dab7..bf7b90f8da84 100644
--- a/metadata/md5-cache/net-fs/davfs2-1.6.0
+++ b/metadata/md5-cache/net-fs/davfs2-1.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=Linux FUSE (or coda) driver that allows you to mount a WebDAV resour
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/davfs2
 IUSE=nls
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
+KEYWORDS=amd64 ~arm ~arm64 ppc x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/libxml2 net-libs/neon sys-libs/zlib nls? ( virtual/libintl virtual/libiconv ) acct-group/davfs2 acct-user/davfs2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://nongnu/davfs2/davfs2-1.6.0.tar.gz
-_md5_=e0bb6d02ed23503640dd8003b63d76d9
+_md5_=4bd133eaadb90bf283858ece81306c68
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index edaecf55dd56..f456fbd69165 100644
Binary files a/metadata/md5-cache/net-ftp/Manifest.gz and b/metadata/md5-cache/net-ftp/Manifest.gz differ
diff --git a/metadata/md5-cache/net-ftp/atftp-0.7.2-r3 b/metadata/md5-cache/net-ftp/atftp-0.7.2-r3
index d421722f826b..5dc3a1c7c304 100644
--- a/metadata/md5-cache/net-ftp/atftp-0.7.2-r3
+++ b/metadata/md5-cache/net-ftp/atftp-0.7.2-r3
@@ -5,10 +5,10 @@ DESCRIPTION=Advanced TFTP implementation client/server
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/atftp/
 IUSE=selinux tcpd readline pcre
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ppc ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0= ) pcre? ( dev-libs/libpcre ) !net-ftp/tftp-hpa !net-ftp/uftpd selinux? ( sec-policy/selinux-tftp )
 SLOT=0
 SRC_URI=mirror://sourceforge/atftp/atftp-0.7.2.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=25055d2f6fa95f4dbd984b40fb8a67be
+_md5_=0fcdc0253cb4d87833c08174fc578939
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 738a6c64eb39..67dd3b5065a0 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/element-desktop-bin-1.7.16 b/metadata/md5-cache/net-im/element-desktop-bin-1.7.18
similarity index 97%
rename from metadata/md5-cache/net-im/element-desktop-bin-1.7.16
rename to metadata/md5-cache/net-im/element-desktop-bin-1.7.18
index 8739e6851e6f..9835e4128387 100644
--- a/metadata/md5-cache/net-im/element-desktop-bin-1.7.16
+++ b/metadata/md5-cache/net-im/element-desktop-bin-1.7.18
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=app-accessibility/at-spi2-atk:2 app-crypt/libsecret dev-db/sqlcipher dev-libs/atk dev-libs/expat dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver x11-libs/pango emoji? ( media-fonts/noto-emoji )
 SLOT=0
-SRC_URI=https://packages.riot.im/debian/pool/main/e/element-desktop/element-desktop_1.7.16_amd64.deb
+SRC_URI=https://packages.riot.im/debian/pool/main/e/element-desktop/element-desktop_1.7.18_amd64.deb
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8a29792e33c256da17c80908e634f618
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 09b69f91288d..0c10b28e4338 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/libgsasl-1.10.0 b/metadata/md5-cache/net-libs/libgsasl-1.10.0
index 58035ee7d221..c2ecedfb9ec6 100644
--- a/metadata/md5-cache/net-libs/libgsasl-1.10.0
+++ b/metadata/md5-cache/net-libs/libgsasl-1.10.0
@@ -5,10 +5,10 @@ DESCRIPTION=The GNU SASL library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gsasl/
 IUSE=idn gcrypt kerberos nls ntlm static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3 LGPL-3
 RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm ) !net-misc/gsasl
 SLOT=0
 SRC_URI=mirror://gnu/gsasl/libgsasl-1.10.0.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=75fbaf40ee07cbecb670a6ecbe6733cc
+_md5_=975356f077fd5a84fba077392889eae3
diff --git a/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1 b/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
index f055858fef13..5962f4701680 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
+++ b/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=net-libs/libnfnetlink-1.0.0 virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=interface to packets that have been logged by the kernel packet filter
-EAPI=5
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure setup
+DEPEND=>=net-libs/libnfnetlink-1.0.0
+DESCRIPTION=Interface to packets that have been logged by the kernel packet filter
+EAPI=7
 HOMEPAGE=https://www.netfilter.org/projects/libnetfilter_log/
-IUSE=static-libs kernel_linux
+IUSE=kernel_linux
 KEYWORDS=amd64 ~ia64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-1.0.1.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1fc63d6b56d5d477b7bac8ce2e3abdbf
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=561359652e01bae0e15f068833b4ba9b
diff --git a/metadata/md5-cache/net-libs/libprotoident-2.0.12 b/metadata/md5-cache/net-libs/libprotoident-2.0.12
deleted file mode 100644
index d4c8d053af68..000000000000
--- a/metadata/md5-cache/net-libs/libprotoident-2.0.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=net-libs/libtrace-4.0.1 >=net-libs/libflowmanager-3.0.0
-DESCRIPTION=A library that performs application layer protocol identification for flows
-EAPI=6
-HOMEPAGE=https://research.wand.net.nz/software/libprotoident.php
-IUSE=static-libs tools
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=net-libs/libtrace-4.0.1 >=net-libs/libflowmanager-3.0.0
-SLOT=0/2
-SRC_URI=https://research.wand.net.nz/software/libprotoident/libprotoident-2.0.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=53e7331984ef3b2fc859a066485b50fa
diff --git a/metadata/md5-cache/net-libs/libprotoident-2.0.13 b/metadata/md5-cache/net-libs/libprotoident-2.0.13
deleted file mode 100644
index d58fa2298c8a..000000000000
--- a/metadata/md5-cache/net-libs/libprotoident-2.0.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=net-libs/libtrace-4.0.1 >=net-libs/libflowmanager-3.0.0
-DESCRIPTION=A library that performs application layer protocol identification for flows
-EAPI=7
-HOMEPAGE=https://research.wand.net.nz/software/libprotoident.php
-IUSE=static-libs tools
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=net-libs/libtrace-4.0.1 >=net-libs/libflowmanager-3.0.0
-SLOT=0/2
-SRC_URI=https://research.wand.net.nz/software/libprotoident/libprotoident-2.0.13.tar.gz
-_md5_=05b25825fd49cf1b1b193795d8229736
diff --git a/metadata/md5-cache/net-libs/libsrtp-2.3.0-r1 b/metadata/md5-cache/net-libs/libsrtp-2.3.0-r1
index bec4134705e9..cfa4a81842f6 100644
--- a/metadata/md5-cache/net-libs/libsrtp-2.3.0-r1
+++ b/metadata/md5-cache/net-libs/libsrtp-2.3.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Open-source implementation of the Secure Real-time Transport Protoco
 EAPI=7
 HOMEPAGE=https://github.com/cisco/libsrtp
 IUSE=debug doc libressl nss openssl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=openssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) nss? ( >=dev-libs/nss-3.52[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=?? ( nss openssl )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2/1
 SRC_URI=https://github.com/cisco/libsrtp/archive/v2.3.0.tar.gz -> libsrtp-2.3.0.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=77dd139814931dffb9191203c1155d43
+_md5_=07c6795d0a0f73b4fd7cd1a10509acf8
diff --git a/metadata/md5-cache/net-libs/net6-1.3.14-r2 b/metadata/md5-cache/net-libs/net6-1.3.14-r2
index ba6e8b56340b..f9e377f9fa8e 100644
--- a/metadata/md5-cache/net-libs/net6-1.3.14-r2
+++ b/metadata/md5-cache/net-libs/net6-1.3.14-r2
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
 DEFINED_PHASES=configure install
-DEPEND=dev-libs/libsigc++:2 >=net-libs/gnutls-1.2.10 virtual/pkgconfig nls? ( sys-devel/gettext )
+DEPEND=dev-libs/libsigc++:2 >=net-libs/gnutls-1.2.10:=
 DESCRIPTION=Network access framework for IPv4/IPv6 written in C++
-EAPI=6
+EAPI=7
 HOMEPAGE=http://gobby.0x539.de/
-IUSE=nls static-libs
+IUSE=nls
 KEYWORDS=amd64 ~arm ~hppa ppc x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libsigc++:2 >=net-libs/gnutls-1.2.10
+RDEPEND=dev-libs/libsigc++:2 >=net-libs/gnutls-1.2.10:=
 SLOT=0
 SRC_URI=http://releases.0x539.de/net6/net6-1.3.14.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8062663652d7d89a9be1896005a2bb65
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=fe747934aa846228b1dfbae7eec9339b
diff --git a/metadata/md5-cache/net-libs/quiche-0.7.0 b/metadata/md5-cache/net-libs/quiche-0.7.0
new file mode 100644
index 000000000000..dc0fef1d4f8c
--- /dev/null
+++ b/metadata/md5-cache/net-libs/quiche-0.7.0
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/rust-1.47.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/cmake >=virtual/rust-1.37.0 dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Implementation of the QUIC transport protocol and HTTP/3
+EAPI=7
+HOMEPAGE=https://github.com/cloudflare/quiche
+IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) BSD-2 BSD ISC MIT || ( Unlicense MIT ) openssl
+SLOT=0/0
+SRC_URI=https://crates.io/api/v1/crates/anyhow/1.0.26/download -> anyhow-1.0.26.crate https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/arrayvec/0.4.11/download -> arrayvec-0.4.11.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/backtrace/0.3.37/download -> backtrace-0.3.37.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/boring-sys/1.0.2/download -> boring-sys-1.0.2.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/bumpalo/3.6.0/download -> bumpalo-3.6.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cast/0.2.3/download -> cast-0.2.3.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/cmake/0.1.45/download -> cmake-0.1.45.crate https://crates.io/api/v1/crates/criterion/0.3.1/download -> criterion-0.3.1.crate https://crates.io/api/v1/crates/criterion-plot/0.4.1/download -> criterion-plot-0.4.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.2/download -> crossbeam-epoch-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.2.1/download -> crossbeam-queue-0.2.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/csv/1.1.3/download -> csv-1.1.3.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/darling/0.10.2/download -> darling-0.10.2.crate https://crates.io/api/v1/crates/darling_core/0.10.2/download -> darling_core-0.10.2.crate https://crates.io/api/v1/crates/darling_macro/0.10.2/download -> darling_macro-0.10.2.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.8/download -> hermit-abi-0.1.8.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/js-sys/0.3.47/download -> js-sys-0.3.47.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.84/download -> libc-0.2.84.crate https://crates.io/api/v1/crates/libm/0.2.1/download -> libm-0.2.1.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memoffset/0.5.3/download -> memoffset-0.5.3.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/num-traits/0.2.11/download -> num-traits-0.2.11.crate https://crates.io/api/v1/crates/num_cpus/1.12.0/download -> num_cpus-1.12.0.crate https://crates.io/api/v1/crates/indexmap/1.6.1/download -> indexmap-1.6.1.crate https://crates.io/api/v1/crates/once_cell/1.5.2/download -> once_cell-1.5.2.crate https://crates.io/api/v1/crates/oorandom/11.1.0/download -> oorandom-11.1.0.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/plotters/0.2.12/download -> plotters-0.2.12.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/qlog/0.4.0/download -> qlog-0.4.0.crate https://crates.io/api/v1/crates/quote/1.0.8/download -> quote-1.0.8.crate https://crates.io/api/v1/crates/rayon/1.3.0/download -> rayon-1.3.0.crate https://crates.io/api/v1/crates/rayon-core/1.7.0/download -> rayon-core-1.7.0.crate https://crates.io/api/v1/crates/regex/1.3.5/download -> regex-1.3.5.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/ring/0.16.19/download -> ring-0.16.19.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.123/download -> serde-1.0.123.crate https://crates.io/api/v1/crates/serde_derive/1.0.123/download -> serde_derive-1.0.123.crate https://crates.io/api/v1/crates/serde_json/1.0.61/download -> serde_json-1.0.61.crate https://crates.io/api/v1/crates/serde_with/1.6.2/download -> serde_with-1.6.2.crate https://crates.io/api/v1/crates/serde_with_macros/1.3.0/download -> serde_with_macros-1.3.0.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/1.4.0/download -> smallvec-1.4.0.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.crate https://crates.io/api/v1/crates/syn/1.0.60/download -> syn-1.0.60.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/tinytemplate/1.0.3/download -> tinytemplate-1.0.3.crate https://crates.io/api/v1/crates/tinyvec/1.1.1/download -> tinyvec-1.1.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.16/download -> unicode-normalization-0.1.16.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.70/download -> wasm-bindgen-0.2.70.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.70/download -> wasm-bindgen-backend-0.2.70.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.70/download -> wasm-bindgen-macro-0.2.70.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.70/download -> wasm-bindgen-macro-support-0.2.70.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.70/download -> wasm-bindgen-shared-0.2.70.crate https://crates.io/api/v1/crates/wasm-bindgen-webidl/0.2.70/download -> wasm-bindgen-webidl-0.2.70.crate https://crates.io/api/v1/crates/web-sys/0.3.47/download -> web-sys-0.3.47.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.3/download -> winapi-util-0.1.3.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/quiche/0.7.0/download -> quiche-0.7.0.crate
+_eclasses_=cargo	7ffdd252643addc68abff0a08cca5306	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0280afe80e23e30306a07596bdeeae11
diff --git a/metadata/md5-cache/net-libs/quiche-9999 b/metadata/md5-cache/net-libs/quiche-9999
index d2d0503f5410..bec14daaa374 100644
--- a/metadata/md5-cache/net-libs/quiche-9999
+++ b/metadata/md5-cache/net-libs/quiche-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=virtual/rust-1.39.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/cmake >=virtual/rust-1.37.0 dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=virtual/rust-1.47.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/cmake >=virtual/rust-1.37.0 dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Implementation of the QUIC transport protocol and HTTP/3
 EAPI=7
@@ -8,4 +8,4 @@ LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-L
 PROPERTIES=live
 SLOT=0/0
 _eclasses_=cargo	7ffdd252643addc68abff0a08cca5306	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de356e40192e3eb3ccd5457b2cd19096
+_md5_=0280afe80e23e30306a07596bdeeae11
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 81d3cd911af6..494b95dd8970 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/mswatch-1.2.0-r1 b/metadata/md5-cache/net-mail/mswatch-1.2.0-r1
index 2ee5eeeb59f8..0b2f9ef05903 100644
--- a/metadata/md5-cache/net-mail/mswatch-1.2.0-r1
+++ b/metadata/md5-cache/net-mail/mswatch-1.2.0-r1
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install setup
-DEPEND=>=dev-libs/glib-2.6:2 virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.6:2
 DESCRIPTION=A utility to watch mailstores for changes and initiate mailbox syncs
-EAPI=6
+EAPI=7
 HOMEPAGE=http://mswatch.sourceforge.net/
-IUSE=static-libs kernel_linux
+IUSE=kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6:2
 SLOT=0
 SRC_URI=mirror://sourceforge/mswatch/mswatch-1.2.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c2839b7fa153f24e839641fffb56e6b8
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=4a87863080541116a7bd05fcd188c05f
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index b888ffc80b2d..e415c1ea8e06 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/dropbox-114.4.426 b/metadata/md5-cache/net-misc/dropbox-114.4.426
index d00e1ed92c5a..afc26bd30434 100644
--- a/metadata/md5-cache/net-misc/dropbox-114.4.426
+++ b/metadata/md5-cache/net-misc/dropbox-114.4.426
@@ -5,11 +5,11 @@ DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
 EAPI=7
 HOMEPAGE=https://www.dropbox.com/
 IUSE=selinux X
-KEYWORDS=~amd64 ~x86 ~x86-linux
+KEYWORDS=amd64 x86 ~x86-linux
 LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
 RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-114.4.426.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-114.4.426.tar.gz )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=02fa288e29ee0a9a2f7aa62d6a0f7805
+_md5_=be9d2f2e18dd487859eae1b02fba253a
diff --git a/metadata/md5-cache/net-misc/gsasl-1.10.0 b/metadata/md5-cache/net-misc/gsasl-1.10.0
index b40e68987b2e..79c1fbce74fe 100644
--- a/metadata/md5-cache/net-misc/gsasl-1.10.0
+++ b/metadata/md5-cache/net-misc/gsasl-1.10.0
@@ -5,10 +5,10 @@ DESCRIPTION=The GNU SASL client, server, and library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gsasl/
 IUSE=doc gcrypt idn kerberos nls ntlm static-libs +threads
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm )
 SLOT=0
 SRC_URI=mirror://gnu/gsasl/gsasl-1.10.0.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=88d508684d0cfedd439826d7baa29c6e
+_md5_=c52afc338a2376334242ccf22946be91
diff --git a/metadata/md5-cache/net-misc/iputils-20200821-r2 b/metadata/md5-cache/net-misc/iputils-20200821-r2
index 9f103608bc5a..981c9b3afbc7 100644
--- a/metadata/md5-cache/net-misc/iputils-20200821-r2
+++ b/metadata/md5-cache/net-misc/iputils-20200821-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Network monitoring tools including ping and ping6
 EAPI=7
 HOMEPAGE=https://wiki.linuxfoundation.org/networking/iputils
 IUSE=+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle nls rarpd rdisc ssl static tftpd tracepath traceroute6 +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD GPL-2+ rdisc
 RDEPEND=traceroute6? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn2:= ) nls? ( sys-devel/gettext ) ) filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/iputils/iputils/archive/s20200821.tar.gz -> iputils-20200821.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/iputils-manpages-20200821.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	fdaf2a7b9376934c1c7ddbd32114defb	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	69861348186337fa4b269de5826004b3	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0c8fa51277c83acf2ec9fda887c9e646
+_md5_=3274ce7f7e2e3e351f19bef0e1160a41
diff --git a/metadata/md5-cache/net-misc/ipv6calc-2.2.0 b/metadata/md5-cache/net-misc/ipv6calc-2.2.0
index bfc6f0b1eae2..e66249e8d4c1 100644
--- a/metadata/md5-cache/net-misc/ipv6calc-2.2.0
+++ b/metadata/md5-cache/net-misc/ipv6calc-2.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=IPv6 address calculator
 EAPI=7
 HOMEPAGE=https://www.deepspace6.net/projects/ipv6calc.html
 IUSE=geoip libressl test
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) geoip? ( >=dev-libs/geoip-1.4.7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pbiering/ipv6calc/archive/2.2.0.tar.gz -> ipv6calc-2.2.0.tar.gz
-_md5_=45d99a6197c44371e4918a010526bf88
+_md5_=5774e5054f1454453b97e6d89a098cc8
diff --git a/metadata/md5-cache/net-misc/suite3270-4.0_p13 b/metadata/md5-cache/net-misc/suite3270-4.0_p13
index 5c00891f3975..f2b0a17b3b2f 100644
--- a/metadata/md5-cache/net-misc/suite3270-4.0_p13
+++ b/metadata/md5-cache/net-misc/suite3270-4.0_p13
@@ -4,10 +4,10 @@ DESCRIPTION=Complete 3270 access package
 EAPI=7
 HOMEPAGE=http://x3270.bgp.nu/
 IUSE=cjk doc ncurses ssl tcl X X
-KEYWORDS=amd64 ~ppc s390 sparc x86
+KEYWORDS=amd64 ppc s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:0= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ncurses? ( sys-libs/ncurses:= sys-libs/readline:0= ) tcl? ( dev-lang/tcl:0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/x3270/suite3270-4.0ga13-src.tgz
 _eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
-_md5_=65ccee65d07f08c40f101739825a2fb3
+_md5_=61414bab4281bc7c8a1d5e28f334edc1
diff --git a/metadata/md5-cache/net-misc/teamviewer-15.14.5 b/metadata/md5-cache/net-misc/teamviewer-15.14.5
new file mode 100644
index 000000000000..56610776321a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/teamviewer-15.14.5
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=sys-apps/sed dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=All-In-One Solution for Remote Access and Support over the Internet
+EAPI=7
+HOMEPAGE=https://www.teamviewer.com
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=TeamViewer MIT
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/dbus !sys-auth/consolekit
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.14.5_amd64.tar.xz ) x86? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.14.5_i386.tar.xz )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=336a59f60bc2e0d78d23d13948f93359
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 0fc07b01f1bf..259f526f15b0 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.15 b/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.15
deleted file mode 100644
index f83033e63a5a..000000000000
--- a/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.15
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare
-DEPEND=<sys-libs/binutils-libs-2.34:= dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs/gtk+-2.2.1:2 ) dbus? ( >=sys-apps/dbus-0.35.2 ) ssl? ( >=net-libs/gnutls-2.2.5 ) nls? ( >=sys-devel/gettext-0.11.5 )
-DESCRIPTION=A GTK+ Gnutella client
-EAPI=7
-HOMEPAGE=http://gtk-gnutella.sourceforge.net/
-IUSE=nls dbus ssl +gtk
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=<sys-libs/binutils-libs-2.34:= dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs/gtk+-2.2.1:2 ) dbus? ( >=sys-apps/dbus-0.35.2 ) ssl? ( >=net-libs/gnutls-2.2.5 ) nls? ( >=sys-devel/gettext-0.11.5 )
-SLOT=0
-SRC_URI=mirror://sourceforge/gtk-gnutella/gtk-gnutella-1.1.15.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5ad160db6dccdc2dbd7bac500785c53c
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 3a9fe43ff781..b17c9f0bbec5 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.5.2_alpha b/metadata/md5-cache/net-vpn/tor-0.4.5.4_rc
similarity index 89%
rename from metadata/md5-cache/net-vpn/tor-0.4.5.2_alpha
rename to metadata/md5-cache/net-vpn/tor-0.4.5.4_rc
index 1327871843e5..aabcc220477d 100644
--- a/metadata/md5-cache/net-vpn/tor-0.4.5.2_alpha
+++ b/metadata/md5-cache/net-vpn/tor-0.4.5.4_rc
@@ -10,6 +10,6 @@ LICENSE=BSD GPL-2
 RDEPEND=acct-user/tor acct-group/tor dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://www.torproject.org/dist/tor-0.4.5.2-alpha.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.5.2-alpha.tar.gz
+SRC_URI=https://www.torproject.org/dist/tor-0.4.5.4-rc.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.5.4-rc.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fed13de8b6e4d700007f31bec93f9e16
+_md5_=0ff62ffe6c7b7741d3068626328f49f4
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index bdb87235fa87..9c9d413ac806 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/blueman-2.1.4 b/metadata/md5-cache/net-wireless/blueman-2.1.4
index 306dbd52ee03..89a7d4bb33dd 100644
--- a/metadata/md5-cache/net-wireless/blueman-2.1.4
+++ b/metadata/md5-cache/net-wireless/blueman-2.1.4
@@ -1,15 +1,15 @@
-BDEPEND=python_single_target_python3_7? ( dev-python/cython[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/cython[python_targets_python3_8(-)] ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=python_single_target_python3_7? ( dev-python/cython[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/cython[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst postrm prepare pretend setup
-DEPEND=python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+DEPEND=python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 DESCRIPTION=Simple and intuitive GTK+ Bluetooth Manager
 EAPI=7
 HOMEPAGE=https://github.com/blueman-project/blueman
-IUSE=appindicator network nls policykit pulseaudio kernel_linux python_single_target_python3_7 python_single_target_python3_8
+IUSE=appindicator network nls policykit pulseaudio kernel_linux python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=GPL-3+ GPL-2
-RDEPEND=python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) sys-apps/dbus x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) appindicator? ( dev-libs/libappindicator:3[introspection] ) network? ( net-firewall/iptables || ( sys-apps/net-tools sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( media-sound/pulseaudio[bluetooth] media-sound/pulseaudio-modules-bt ) )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RDEPEND=python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) sys-apps/dbus x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) appindicator? ( dev-libs/libappindicator:3[introspection] ) network? ( net-firewall/iptables || ( sys-apps/net-tools sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( media-sound/pulseaudio[bluetooth] media-sound/pulseaudio-modules-bt ) )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/blueman-project/blueman/releases/download/2.1.4/blueman-2.1.4.tar.xz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	69861348186337fa4b269de5826004b3	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ceb57ad82a8778ec6e5916e2d2e3c344
+_md5_=0d8e20a501035d1cfa9945d4c2f5671a
diff --git a/metadata/md5-cache/net-wireless/blueman-9999 b/metadata/md5-cache/net-wireless/blueman-9999
index 2aeaff596071..89c621250fad 100644
--- a/metadata/md5-cache/net-wireless/blueman-9999
+++ b/metadata/md5-cache/net-wireless/blueman-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_single_target_python3_7? ( dev-python/cython[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/cython[python_targets_python3_8(-)] ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_single_target_python3_7? ( dev-python/cython[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/cython[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst postrm prepare pretend setup unpack
-DEPEND=python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+DEPEND=python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 DESCRIPTION=Simple and intuitive GTK+ Bluetooth Manager
 EAPI=7
 HOMEPAGE=https://github.com/blueman-project/blueman
-IUSE=appindicator network nls policykit pulseaudio kernel_linux python_single_target_python3_7 python_single_target_python3_8
+IUSE=appindicator network nls policykit pulseaudio kernel_linux python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=GPL-3+ GPL-2
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) sys-apps/dbus x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) appindicator? ( dev-libs/libappindicator:3[introspection] ) network? ( net-firewall/iptables || ( sys-apps/net-tools sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( media-sound/pulseaudio[bluetooth] media-sound/pulseaudio-modules-bt ) )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RDEPEND=python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) sys-apps/dbus x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) appindicator? ( dev-libs/libappindicator:3[introspection] ) network? ( net-firewall/iptables || ( sys-apps/net-tools sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( media-sound/pulseaudio[bluetooth] media-sound/pulseaudio-modules-bt ) )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	69861348186337fa4b269de5826004b3	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c40f4679d27081ba8b2e0f1e67bca09e
+_md5_=a41b4588f857cfaf0f301f27cca58f8c
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index c43540af3e31..b5c89974c62f 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021_rc1 b/metadata/md5-cache/sci-chemistry/gromacs-2021
similarity index 96%
rename from metadata/md5-cache/sci-chemistry/gromacs-2021_rc1
rename to metadata/md5-cache/sci-chemistry/gromacs-2021
index a42b0a14619d..c91163a6e04b 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021_rc1
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021
@@ -9,7 +9,7 @@ LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
-SLOT=0/2021_rc1
-SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2021-rc1.tar.gz test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2021-rc1.tar.gz )
+SLOT=0/2021
+SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2021.tar.gz test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2021.tar.gz )
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	5363e4936a5e855108ec3fd191bd2b3c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	69861348186337fa4b269de5826004b3	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=194ba1e6d581f1170da20c6c2fc95c06
diff --git a/metadata/md5-cache/sec-policy/Manifest.gz b/metadata/md5-cache/sec-policy/Manifest.gz
index 707a786c80e3..09b2574c60b8 100644
Binary files a/metadata/md5-cache/sec-policy/Manifest.gz and b/metadata/md5-cache/sec-policy/Manifest.gz differ
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20190609-r1
deleted file mode 100644
index 1f0db66a1f88..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-abrt-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for abrt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=890f658d8a99d0afd8330d89cdb18449
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20190609-r1
deleted file mode 100644
index 20e36cd8f922..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for accountsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=2b8711366d65e0b0ffb8975159e4c1ca
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-acct-2.20190609-r1
deleted file mode 100644
index 821b09740f80..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-acct-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for acct
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6b3f5313b3dfe2fa163d2c23c1cd980e
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ada-2.20190609-r1
deleted file mode 100644
index e490d3307c6c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ada-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ada
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=70aa2d3e78e7c3866b898be7b6cab6e5
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-afs-2.20190609-r1
deleted file mode 100644
index 2195ab4e8f1d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-afs-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for afs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b9585b0426bfa499b7d78b096eb7207b
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-aide-2.20190609-r1
deleted file mode 100644
index d89cf900817b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-aide-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for aide
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=4acf14ecfe153a61d5f5b2982abd4062
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20190609-r1
deleted file mode 100644
index c0b8d8ccd590..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-alsa-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for alsa
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=39bdb937daa993062fb04026d15d25d3
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20190609-r1
deleted file mode 100644
index 4c0f31fae7a3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-amanda-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for amanda
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=ce93950b26b5485478db337db8854795
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20190609-r1
deleted file mode 100644
index f6c0ad179e36..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-amavis-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for amavis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=cbce383b689e5d7eac7847e57d61f2c5
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-android-2.20190609-r1
deleted file mode 100644
index 839aa1dc31c6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-android-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for android
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=e61a833f652198000be9bd3bdf32a42c
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-apache-2.20190609-r1
deleted file mode 100644
index 809879104598..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for apache
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c163787369f9702fcad9a39a00fe703d
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20190609-r1
deleted file mode 100644
index 607dabddcd2c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for apcupsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=2b09540eaf90b8e0a2a7a6fd8daaec63
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-apm-2.20190609-r1
deleted file mode 100644
index 94bbedc1082b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apm-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for acpi
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=ca778587f8dfad569e8d17ecb21d6376
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20190609-r1
deleted file mode 100644
index e37fe3b59e60..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for arpwatch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5e56f6642091e72b9163084feb4c14a8
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20190609-r1
deleted file mode 100644
index c6425ed4a9d8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for asterisk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b8c3c1f82570d7267dd406b20f327910
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-at-2.20190609-r1
deleted file mode 100644
index 4faf98011a14..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-at-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for at
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b98d0baabfac1b40015135cc5704d065
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-automount-2.20190609-r1
deleted file mode 100644
index 65566b6b8dae..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-automount-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for automount
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3df0fbd06e5e5b83c2320ff79444704e
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20190609-r1
deleted file mode 100644
index 9cb15fb8e56a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-avahi-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for avahi
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=e0feb21b430a33908bbb4f807001989b
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20190609-r1
deleted file mode 100644
index 7ea77f747038..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-awstats-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for awstats
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=1b145a306910a6368178fe4a2fa860ef
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-backup-2.20190609-r1
deleted file mode 100644
index fc7542f5bd86..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-backup-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for generic backup apps
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=9ad6c0ff3402703f079f5a16447580d7
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20190609-r1
deleted file mode 100644
index 41e01fb3d8be..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bacula-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bacula
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=7561da95f4fecf7b79c33bce19b2785e
diff --git a/metadata/md5-cache/sec-policy/selinux-base-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-base-2.20190609-r1
deleted file mode 100644
index 5ff05abc11a0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-base-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-apps/policycoreutils-2.8 sys-devel/m4 >=sys-apps/checkpolicy-2.8
-DESCRIPTION=Gentoo base policy for SELinux
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=doc +unknown-perms systemd +ubac +unconfined
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.8
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_md5_=7c2af04a5eeadd60cd80ae441e468425
diff --git a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-base-policy-2.20190609-r1
deleted file mode 100644
index 0018fe602a49..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20190609-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare pretend
-DEPEND==sec-policy/selinux-base-2.20190609-r1[systemd?]
-DESCRIPTION=SELinux policy for core modules
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=systemd +unconfined
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-PDEPEND=unconfined? ( sec-policy/selinux-unconfined )
-RDEPEND==sec-policy/selinux-base-2.20190609-r1[systemd?]
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_md5_=0b4dee9637e85c91ef495b1ced16a785
diff --git a/metadata/md5-cache/sec-policy/selinux-base-policy-9999 b/metadata/md5-cache/sec-policy/selinux-base-policy-9999
index a55a4eed621d..7af1761612df 100644
--- a/metadata/md5-cache/sec-policy/selinux-base-policy-9999
+++ b/metadata/md5-cache/sec-policy/selinux-base-policy-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND==sec-policy/selinux-base-9999[systemd?]
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441
-_md5_=b42ca2b47c58a0a1d24dda75f3886b82
+_md5_=ad7e8b4aca6944b3460316c0590f96e0
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-bind-2.20190609-r1
deleted file mode 100644
index 74b8a1c7cdf0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bind-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bind
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=1f1d57bf72299d3046bf37f4ffee91a1
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20190609-r1
deleted file mode 100644
index c1189e3e2974..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bitcoin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=985e90b348a4c30b7d5b5bab02afd4c1
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20190609-r1
deleted file mode 100644
index c42016cc1169..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bitlbee
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=4519a87756b7ea6667d1e345d6fc292c
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20190609-r1
deleted file mode 100644
index c0d3f92f9e28..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bluetooth
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=ae2d9980e857a4d7d34298fc1b5b0e87
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20190609-r1
deleted file mode 100644
index bf25512f8a08..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-brctl-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for brctl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=d48cc39f7e66156e2704888282089bed
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20190609-r1
deleted file mode 100644
index 99dd5a81357e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cachefilesd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=1beca5635731c476fdfd2773bd598543
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20190609-r1
deleted file mode 100644
index ef1be4245490..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for calamaris
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=cabaa07211ca830b9d6dee0011904a7b
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-canna-2.20190609-r1
deleted file mode 100644
index f99926d79153..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-canna-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for canna
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=54147818d940387fbca70ead77e0028e
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20190609-r1
deleted file mode 100644
index 7a2043b82b9e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ccs-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ccs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a0dc400f36aafae7141be2bb982da496
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20190609-r1
deleted file mode 100644
index 34767605c3de..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cdrecord
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=76d2b29bef98cb93c464cf63eab63056
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20190609-r1
deleted file mode 100644
index 0c397e363e5d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ceph-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ceph
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=400d25014787f24345b01e6648e6ad95
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20190609-r1
deleted file mode 100644
index 3b7dbc6274dc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cgmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c18cabfa673d8e87ba926dc91e2a5ec7
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20190609-r1
deleted file mode 100644
index 30012c06adea..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cgroup
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=e947b35899f76d8148d3a0bff206cf64
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20190609-r1
deleted file mode 100644
index 24c4bbcc2193..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-chromium-2.20190609-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for chromium
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=132a76cacc720ddb84d169aeb034d0b2
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20190609-r1
deleted file mode 100644
index 1d7ae985fa36..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for chronyd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=99a2577d95f0559d1a0cb1aaa8d34f95
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20190609-r1
deleted file mode 100644
index cf53f1721f1a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-clamav-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for clamav
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c9e219c79d7e370079e1bc176b1d7473
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20190609-r1
deleted file mode 100644
index 36fa53988b91..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for clockspeed
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=18f37249b33ad0c30b902f278d848e29
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20190609-r1
deleted file mode 100644
index ad9a15fe123c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-collectd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for collectd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a07fe5b8d40615d37ce87800467b8e15
diff --git a/metadata/md5-cache/sec-policy/selinux-colord-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-colord-2.20190609-r1
deleted file mode 100644
index 4ba622e332b5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-colord-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for colord
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=266bb3bb643d2a48386ccdf78931c732
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20190609-r1
deleted file mode 100644
index 9f93ccaa9d4b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-corosync-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for corosync
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=8d31920fe160df226777a349ee8c0a04
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20190609-r1
deleted file mode 100644
index a7a18f6346f6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for couchdb
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=feeff9e8eec99ab228b724ae60d7dc33
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-courier-2.20190609-r1
deleted file mode 100644
index a01c8e732e6e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-courier-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for courier
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=f34f2145d745a4cfffde5b785a2afb5e
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20190609-r1
deleted file mode 100644
index 5eb09592232c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cpucontrol
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=4cbe8fdc7eb5851e9437b658ba8e10a0
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20190609-r1
deleted file mode 100644
index 159f5263112d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cpufreqselector
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=9356d5a0ccfa2c750a856443d1b4cfd0
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-cups-2.20190609-r1
deleted file mode 100644
index ee9596015330..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cups
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=92febf8c49c7fad763ea05f933064498
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20190609-r1
deleted file mode 100644
index 61cc44735968..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cvs-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cvs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=35a47288882182b57e3e72a180bd6510
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20190609-r1
deleted file mode 100644
index 60973611bbe6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cyphesis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=f11df02e58ead1d82aaa20cc7cd836eb
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20190609-r1
deleted file mode 100644
index 50c81558a5cc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for daemontools
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=7276bfe4e05fbd7714ef52a963c030f9
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dante-2.20190609-r1
deleted file mode 100644
index 02fd2c64ac4c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dante-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dante
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=50d8d3ac0a2ad7a590acecee4a31b150
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20190609-r1
deleted file mode 100644
index d962612c875c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbadm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=fb9a1d309f5a57ea3075189e48f297be
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20190609-r1
deleted file mode 100644
index 77b77d733a1b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbskk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=daf23695d7c1d1c1ed70fb0dec004221
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20190609-r1
deleted file mode 100644
index 80049eed6b03..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbus-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=fb2356cf1d53f5d1e2b2fbc0e5bdadd6
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20190609-r1
deleted file mode 100644
index 01ce7a5d8539..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dcc-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dcc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=ea5f2da63d0d02f42785ddbc9c34d006
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20190609-r1
deleted file mode 100644
index 4d517eceacb1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ddclient
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=7a74d850e7dc4e46e90afc469ce7c3ab
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20190609-r1
deleted file mode 100644
index 06a2fb6feedf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ddcprobe
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=05ba03e76310ae8387c5806fa5f40197
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20190609-r1
deleted file mode 100644
index f7475e448ddd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for denyhosts
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=bcd69e3afd859002241764ba12fceb94
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20190609-r1
deleted file mode 100644
index 507ed54bd5cd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for devicekit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=0a3e0386d095cb28cd2744b9d30fd935
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20190609-r1
deleted file mode 100644
index f0b2c34c4f4b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dhcp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b880b5eb6876eca756c355b42a4c8a32
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20190609-r1
deleted file mode 100644
index 5688d26825e9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dictd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dictd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=30f053200193e1af823ae56ba2220e86
diff --git a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20190609-r1
deleted file mode 100644
index 04356b6effab..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dirmngr
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=1167b4c6975dabc36e4c978f7461e2a8
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20190609-r1
deleted file mode 100644
index 0b044a155652..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dirsrv
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3dfa885d59e4520e3c02d50a72d04a9d
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20190609-r1
deleted file mode 100644
index ff37a98705c8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-distcc-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for distcc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=bfb2532a0f3abd624d50806ad0bf4bd9
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20190609-r1
deleted file mode 100644
index 0e897efa312b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for djbdns
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=d722fd8977b94b6217108626055e06cb
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20190609-r1
deleted file mode 100644
index c2480436f295..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dkim-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dkim
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=e44036f3ca13145518194ef3a86e28e8
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20190609-r1
deleted file mode 100644
index b9f29304bdc9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dmidecode
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=9e5d1c91574697bee3bbb97777e622a1
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20190609-r1
deleted file mode 100644
index 7469d138cd44..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dnsmasq
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=dbdbe91f57b297937aae53763b85ef3d
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20190609-r1
deleted file mode 100644
index 696c1eda91fa..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dovecot
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=08bc70707b1c4713c57ff99be0ab5c47
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20190609-r1
deleted file mode 100644
index 990eaf9e2c6b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dpkg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=f5474ccced5516dc762ad97d9d5efe27
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20190609-r1
deleted file mode 100644
index 97fad3dc069e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dracut-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dracut
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6b45c4c32962c1b11262db563745e499
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20190609-r1
deleted file mode 100644
index af01a0359117..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dropbox
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3b464e63c1959607f5d61da5702c41e9
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20190609-r1
deleted file mode 100644
index 0fc2ceb87e67..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for entropyd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=2a4a7436f7e83cb879fd04aa34133c8f
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20190609-r1
deleted file mode 100644
index e900bfcdfa1b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-evolution-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for evolution
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a839c3060223326e76e5af83f537f3a3
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-exim-2.20190609-r1
deleted file mode 100644
index 3faf17f7b595..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-exim-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for exim
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=bf4faa9010f635c6145d6072bfae8c03
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20190609-r1
deleted file mode 100644
index 32b74fb29e02..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fail2ban
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6610ed378f453f649facc32858562d69
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20190609-r1
deleted file mode 100644
index ab157b8d0253..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fetchmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a58d2a0bf5f966b8356ef6f6af8d9cde
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-finger-2.20190609-r1
deleted file mode 100644
index 500c3fa6da32..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-finger-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for finger
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=8718b06ae58a79d6dcd3e472bd8b1ff9
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-flash-2.20190609-r1
deleted file mode 100644
index a225c6d97d3e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-flash-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for flash
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b8622c465ca9eb5ba83d5802ab923cd3
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20190609-r1
deleted file mode 100644
index cd973a624e05..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fprintd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=efdfb026aa9ac9dd91f93b3331714662
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20190609-r1
deleted file mode 100644
index e518e5c27f9a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ftp-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ftp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=8035346c30e72e0af7a43552a33630cf
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-games-2.20190609-r1
deleted file mode 100644
index fcc7c0f04753..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-games-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for games
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=7e2e79d766bfdcc9cf849530f46a8135
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20190609-r1
deleted file mode 100644
index 8e0e3be83f17..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gatekeeper
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=9c52f9d5b68113af27de279367130d07
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-git-2.20190609-r1
deleted file mode 100644
index 874dd5cbc2bd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-git-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for git
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b0b7c2ce05640e4de50438703f5781d6
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20190609-r1
deleted file mode 100644
index 0072f1a7c47a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gitosis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=410d854d2e88d43178cb5c24fb539916
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20190609-r1
deleted file mode 100644
index 363cca7d36dc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gnome-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gnome
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=7fff4e85195dca4ced69d8ec4b1b30ae
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20190609-r1
deleted file mode 100644
index a3d17bf59afa..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20190609-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for googletalk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=9f4e3ae24bb1de828040e3acc6cb6d39
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20190609-r1
deleted file mode 100644
index c1961d87f519..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gorg-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gorg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=56b93be2d22ba45a4182224676af0962
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20190609-r1
deleted file mode 100644
index 77361e94b2f8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpg-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6f7ec6450d21b3cb9b3a8111b9e67705
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20190609-r1
deleted file mode 100644
index b9f67118e338..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpm-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=54ff6aaff055acfb4728b2221ee51d40
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20190609-r1
deleted file mode 100644
index 5d28a0c7b205..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=9e3716b5e17ae5e3b5e75d450da89f49
diff --git a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20190609-r1
deleted file mode 100644
index 2fdc68f81574..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gssproxy
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5f29414a361633bd5c069646c881901d
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20190609-r1
deleted file mode 100644
index 3cb93a33f8b6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for hddtemp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=751eeeedbc0ecbb98f57b1313155a64e
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-howl-2.20190609-r1
deleted file mode 100644
index 2f3a546743e1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-howl-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for howl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=43e2f72624dda67652db5bf590029361
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20190609-r1
deleted file mode 100644
index d849ee9bdcef..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-icecast-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for icecast
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a1ab1b49389adecac0bf71b182a49882
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20190609-r1
deleted file mode 100644
index 99077bf88c8f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ifplugd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3cba97d459fa92a77958abaf6916c276
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20190609-r1
deleted file mode 100644
index 488a4260065a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-imaze-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for imaze
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=bc90bab13571bab1af3e0b0c0e92f905
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20190609-r1
deleted file mode 100644
index 61f197c84a45..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-inetd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for inetd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=0d053136f029888924edcfc036a90c14
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-inn-2.20190609-r1
deleted file mode 100644
index 61afcc14b797..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-inn-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for inn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=cc173496c40912134053dd889f2700fd
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20190609-r1
deleted file mode 100644
index dff38983bc2b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ipsec
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=bfa5af92f6581e8432c469362a450b69
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-irc-2.20190609-r1
deleted file mode 100644
index e3b8930b0e29..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-irc-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for irc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=05e5b338107d3c181c722fc8fdc4a9b8
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20190609-r1
deleted file mode 100644
index 54ec2ae1ebad..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ircd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ircd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3875a5375c971f53cc9b04f8e3a64bfe
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20190609-r1
deleted file mode 100644
index ad9b958d7652..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for irqbalance
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5ba5933b39c26b7814a88507554364bc
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20190609-r1
deleted file mode 100644
index e3cff14f4070..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-jabber-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for jabber
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=73a53eda43ca63538ac5ac0d9e125cbf
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-java-2.20190609-r1
deleted file mode 100644
index 60c32b84e6fb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-java-2.20190609-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for java
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=2e55f00bb85c974be23ce20e6e2a4b6c
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20190609-r1
deleted file mode 100644
index d90875898cd2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kdeconnect
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=2d980d2a2ecae4c81aeefc269ab7f9a6
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20190609-r1
deleted file mode 100644
index d6b5748b8b5c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kdump-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kdump
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3fa1d480ea11ae879b9f73ca0ff28a79
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20190609-r1
deleted file mode 100644
index 8457fdebacdd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kerberos
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=316b68134565e6cb8f614525dcac0bd9
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20190609-r1
deleted file mode 100644
index 2d32a8ec7fa2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kerneloops
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5ecb0af055347f06aa60b91f25ccd9a5
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20190609-r1
deleted file mode 100644
index 0d1a99f5716c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kismet-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kismet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c51da03ef383f0c857a8bfa191cfc0ae
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20190609-r1
deleted file mode 100644
index 22b8a83d05b1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ksmtuned
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b9b5d2f2673a921f49970842071c2263
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20190609-r1
deleted file mode 100644
index ea4ac6ff0870..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kudzu
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=4d4acf1774e418276e60a1aad268b6f9
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-9999 b/metadata/md5-cache/sec-policy/selinux-kudzu-9999
deleted file mode 100644
index 96e1f05aa316..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
-DESCRIPTION=SELinux policy for kudzu
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
-SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6a6006c673cb7b28568c3c2d1f6f4a2a
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20190609-r1
deleted file mode 100644
index bd0f381b0d96..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ldap-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ldap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=bea011199ecc4c038ef81613fb9e0572
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-links-2.20190609-r1
deleted file mode 100644
index 70d24b7c023a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-links-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for links
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=7ef191bcab0b13009ba4a40ea3f22961
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20190609-r1
deleted file mode 100644
index a8a6dc762f5e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lircd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lircd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=68cb45ad78bfb33b554f37c5d0218b64
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20190609-r1
deleted file mode 100644
index 43cd0800eced..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for loadkeys
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=43a36322832619723c2513f83c3a20ca
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20190609-r1
deleted file mode 100644
index 10df9980ed20..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lockdev
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5e24a2c36ead55cf0883d3e12851d13a
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20190609-r1
deleted file mode 100644
index e0f7d164e2ee..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logrotate
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=ca9976056371eb687248b57dc0318fe8
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20190609-r1
deleted file mode 100644
index 322ebcce4f35..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logsentry
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=9549dc0b418f0946a337abbc5581544f
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20190609-r1
deleted file mode 100644
index 5ac2a484592c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logwatch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b8949a42f524cc0ee9534946f54c23a4
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20190609-r1
deleted file mode 100644
index ed76d1303b7c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lpd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=627348b850777ee5865a10a974071f10
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20190609-r1
deleted file mode 100644
index 1f22dc456225..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mailman-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mailman
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=e4984cc29c7ddeead84f86825c1edf53
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20190609-r1
deleted file mode 100644
index 117e31c82c06..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for makewhatis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6ab43104da973e7f22e080de56019d9b
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20190609-r1
deleted file mode 100644
index 70383aa1287b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mandb-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mandb
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a71303a2afbe7e50807d170263d27f3c
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20190609-r1
deleted file mode 100644
index 5c5826140f2f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mcelog
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c7bdf6e1c5543440aa1caca5b2104fe0
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20190609-r1
deleted file mode 100644
index d62289e6bc53..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-memcached-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for memcached
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=68e3ce60c44083573d9a101d4dd67107
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-milter-2.20190609-r1
deleted file mode 100644
index 65483119c4b9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-milter-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for milter
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=631de6c07972a33922045bf99beed69f
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20190609-r1
deleted file mode 100644
index cce2440d372a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for modemmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=749da5ef7d80055fe5de323c9a0a6379
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-mono-2.20190609-r1
deleted file mode 100644
index 557bba7e1c37..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mono-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mono
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6db1ffe2f17806a7e01fcaf750a3a60e
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20190609-r1
deleted file mode 100644
index e85f2b734e61..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20190609-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mozilla
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=e2a3c90e0509bef63eda95a7f2216418
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20190609-r1
deleted file mode 100644
index dad369a715be..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mpd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=e357719180c1925602154081c43d16e5
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20190609-r1
deleted file mode 100644
index 92f8fce6c72b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20190609-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mplayer
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=91a9770460e4f948f0165a407d1c7466
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20190609-r1
deleted file mode 100644
index b79e656984c0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mrtg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b6b7491537270b9f96a1f1f935559e12
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-munin-2.20190609-r1
deleted file mode 100644
index 21c6625c9766..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-munin-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for munin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=0a93842833cd9bbb91a52e915533cf0a
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20190609-r1
deleted file mode 100644
index 800e8d76465b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mutt-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mutt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=ddb89e48ebbe7d62a9e9a1d36d4cd2f9
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20190609-r1
deleted file mode 100644
index 4e671d696060..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mysql-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mysql
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=f08b3ba691919ffdffb9012c62699031
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20190609-r1
deleted file mode 100644
index 819502d5ed3e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nagios-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nagios
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=bbb876df859ff52042372b69fe255b1f
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20190609-r1
deleted file mode 100644
index 1dc03ef6d12b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ncftool
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=fd37c2ea9249fcbdda5cde7e1d2492bf
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20190609-r1
deleted file mode 100644
index bf630e3910eb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for networkmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c116d4fa341079848c53a07232bdc83d
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20190609-r1
deleted file mode 100644
index e570029e1446..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nginx-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nginx
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=9274eb1ea3b1463e8ca9091aef314bf7
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20190609-r1
deleted file mode 100644
index 804910ba32cb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nslcd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=bb9f6282e0d502ca60126ece17751152
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20190609-r1
deleted file mode 100644
index 8ab774055b5b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ntop-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ntop
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=ed65d4fa1b762b26e64952ae26259644
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20190609-r1
deleted file mode 100644
index c5d8977d5e3a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ntp-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ntp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=bede2ebf6ef02e143aa103c2000b0d1c
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-nut-2.20190609-r1
deleted file mode 100644
index 323a6db68117..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nut-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nut
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c29ed8cc0ab16aeec591d72c4facf3bd
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-nx-2.20190609-r1
deleted file mode 100644
index 4de98f9163fd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nx-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nx
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=af609b7add7f21cdb5fcfa27763b40c7
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20190609-r1
deleted file mode 100644
index 3dde62b92dff..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for oddjob
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=fd4dbfe7cbf2ef352540e1d1dcf7e1b0
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-oident-2.20190609-r1
deleted file mode 100644
index 889e915034f4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-oident-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for oident
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3d6f7ae530bc9853974d5f680e4ad776
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-openct-2.20190609-r1
deleted file mode 100644
index 86d0aeb733ab..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openct-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openct
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=88c3c725c24146f4e51cbd5184b38ec1
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20190609-r1
deleted file mode 100644
index bc7e77bc44ca..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openrc-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openrc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=7c832c738ebf25c150acb525e211363f
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20190609-r1
deleted file mode 100644
index 96c3e286dfd9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openvpn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=61013425e649bd329ca1901da95e9cea
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-pan-2.20190609-r1
deleted file mode 100644
index 75328ac9e0b5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pan-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pan
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=564673d258d74b2a343fae178498e1de
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20190609-r1
deleted file mode 100644
index 02f023156a9b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pcmcia
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6dfec9011cd12da465eda41036b8e472
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-9999 b/metadata/md5-cache/sec-policy/selinux-pcmcia-9999
deleted file mode 100644
index 9e0baa8864b9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
-DESCRIPTION=SELinux policy for pcmcia
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
-SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=72fd9e9fe7a0b6ca20bff48a4e7532b9
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20190609-r1
deleted file mode 100644
index c5a2b2b34f11..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pcscd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a2d3acb7822e4080bfa12555a6035bd6
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20190609-r1
deleted file mode 100644
index f221ff760086..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for phpfpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=1957136ee1d44be668d5f1733ae0cbef
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20190609-r1
deleted file mode 100644
index f3513064d9c7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for plymouthd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=04a8595c280c8f3b1a7b6e1900e8b9f0
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20190609-r1
deleted file mode 100644
index bb63d4ab27df..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for podsleuth
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=d5fdb68e87d9d4525c5670acff41d5c3
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-9999 b/metadata/md5-cache/sec-policy/selinux-podsleuth-9999
deleted file mode 100644
index dd9f00d29633..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
-DESCRIPTION=SELinux policy for podsleuth
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
-SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=eeda8c8f983d80e9a570e3feb4b275f0
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20190609-r1
deleted file mode 100644
index 84db8adb70d9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-policykit-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for policykit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a394c585f7a63f6f92ef2876c0f8c2e9
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20190609-r1
deleted file mode 100644
index 309bb8b59f50..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-portmap-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for portmap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=4893d81e58328c61595ef83bf427ab84
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20190609-r1
deleted file mode 100644
index b338a354696b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postfix-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postfix
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=62891ae24f0ebb0764ac6916da14b937
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20190609-r1
deleted file mode 100644
index 15fa5f48f92f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postgresql
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=863e69d2534df45eae7ad72170f975d8
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20190609-r1
deleted file mode 100644
index 663d78f46063..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postgrey
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=2fb522957056a7f07d39f9bf41d8d021
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20190609-r1
deleted file mode 100644
index 5aecd261c589..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ppp-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ppp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=cd322253df5d97addf7309121660bd1b
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20190609-r1
deleted file mode 100644
index 0c6ed56eb8e2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-prelink-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for prelink
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=e8a976daf4404d045303f1359daf9f58
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20190609-r1
deleted file mode 100644
index 82365b734d78..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for prelude
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c352fccfd9b7396447ec1d4d45ece668
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20190609-r1
deleted file mode 100644
index a49ffc2ffc4d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for privoxy
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=cdf9cd3e275571b974b46c81a008bd56
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20190609-r1
deleted file mode 100644
index 4d5fa90dc136..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-procmail-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for procmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=1573e31e7f8260e3e8aced8b53ea7ec5
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-psad-2.20190609-r1
deleted file mode 100644
index b64e59bd18fb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-psad-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for psad
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=9240b333f3ae9e7a833da47f211c9820
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20190609-r1
deleted file mode 100644
index 293f2734051b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for publicfile
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=1acd550b44e990331d2801ce962d3368
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20190609-r1
deleted file mode 100644
index 7b2d2d31384e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pulseaudio
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=15042aae7cfce62676cb4da58e23f606
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20190609-r1
deleted file mode 100644
index eaf1c6b53609..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-puppet-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for puppet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=adcfcbcbf792d6d8af326cb437c87293
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20190609-r1
deleted file mode 100644
index 7aa4f317ff4b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pyicqt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=063940920809fa478d540c53257d109a
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20190609-r1
deleted file mode 100644
index 95c54ddea518..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pyzor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6b3b4ad3f961578e1b363ac49e6faa1b
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20190609-r1
deleted file mode 100644
index 68f25518e8b1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-qemu-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for qemu
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=4780a98a63f430221523338f39cdd3d8
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20190609-r1
deleted file mode 100644
index 7251c9733b7a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-qmail-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for qmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=64118d1a7f6a9bfccba30d29d84e9ca1
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-quota-2.20190609-r1
deleted file mode 100644
index 41cdd5058dab..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-quota-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for quota
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=df00e628cfbb6cded23d7420706e5c6e
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-radius-2.20190609-r1
deleted file mode 100644
index 2d65efbc6baf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-radius-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for radius
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=44ac99eef7b015530e975587a7d3e502
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20190609-r1
deleted file mode 100644
index 121532faa5ce..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-radvd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for radvd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=9dd2ce957b85bbd5e021749f180c7ac2
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-razor-2.20190609-r1
deleted file mode 100644
index 039ab6c464ec..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-razor-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for razor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=e4bf0d283e050518774a648c714d1268
diff --git a/metadata/md5-cache/sec-policy/selinux-redis-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-redis-2.20190609-r1
deleted file mode 100644
index 23ec84a0be79..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-redis-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for redis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=fc99f9ad4e03fa07aad21fdecf1d46e3
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20190609-r1
deleted file mode 100644
index 5b7c82a402db..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for remotelogin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=8d9cc7db2b63ac05406a8c3b9f9964a7
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20190609-r1
deleted file mode 100644
index 9b85a585528f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for resolvconf
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b0dcf3ff37efc164051ae149c423fa1e
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20190609-r1
deleted file mode 100644
index 39d94df995e3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rgmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6990a61f96bda55d327fffce39c0ec39
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20190609-r1
deleted file mode 100644
index 69a38de1172b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rngd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rngd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b7c13d1d70140eb8af8e1d559eed8563
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20190609-r1
deleted file mode 100644
index 2a162c2a56b6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-roundup-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for roundup
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=54a643f7a354c984d306fdb28092d3fd
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-9999 b/metadata/md5-cache/sec-policy/selinux-roundup-9999
deleted file mode 100644
index e94faba71b81..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-roundup-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
-DESCRIPTION=SELinux policy for roundup
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
-SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=1fda28944f125ecb31ffa439427cd4c9
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20190609-r1
deleted file mode 100644
index ff1f5c8b185f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpc-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=01504e76614a3eeec2645824df3b62c3
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20190609-r1
deleted file mode 100644
index d5d74388f893..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpcbind
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3b9c0639fe36dec3a19ea3b7865e4750
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20190609-r1
deleted file mode 100644
index fcd7aee7ea1b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpm-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=205748421295c086c9d3db9040b01c53
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20190609-r1
deleted file mode 100644
index ee5069317a07..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rssh-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rssh
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=8e3ab3350a3c8b1b38451c25d8de2bf2
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20190609-r1
deleted file mode 100644
index 0b51726cbc54..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rtkit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3d7f2acbb845b34be2f174752953802c
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20190609-r1
deleted file mode 100644
index f1950f8e74e7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rtorrent
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3140f9ce1a4ff6a9188c3eaf9f1fc435
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-salt-2.20190609-r1
deleted file mode 100644
index 2371c8ce5e95..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-salt-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for salt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=31a80aeb136c145c1ddd81561b775fd3
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-samba-2.20190609-r1
deleted file mode 100644
index 4947a15e63d8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-samba-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for samba
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=4d3863326a8b11013cdaf7e6a0055efc
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20190609-r1
deleted file mode 100644
index a7485d998d6b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sasl-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sasl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=ff86703d069017cc414f2efe7e4992a3
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-screen-2.20190609-r1
deleted file mode 100644
index 075c5cc0b88d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-screen-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for screen
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=d5ea669e4e069848f9ccabb8d9b2787e
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20190609-r1
deleted file mode 100644
index 4dbde7e27bdb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sendmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=afb3cbd1a04cd7872dbc1843be334451
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20190609-r1
deleted file mode 100644
index 0188ef7b23ee..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sensord-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sensord
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6815783f7e11f3f22a4e11d6ffbf6993
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20190609-r1
deleted file mode 100644
index 1b9910e1df6e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for shorewall
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=61867bb467e758c6202d0441e6baf4a1
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20190609-r1
deleted file mode 100644
index 843f5c481a55..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for shutdown
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=34fb2e65ab6b6628d665c8dd74234ba3
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-skype-2.20190609-r1
deleted file mode 100644
index 8d5d7b122e03..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-skype-2.20190609-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for skype
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5203163b93f28903897f7f12e6b3fd36
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20190609-r1
deleted file mode 100644
index 1178947719a2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-slocate-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for slocate
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=7f9a39f5e3080ee85463d462927574d3
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20190609-r1
deleted file mode 100644
index b40681d66198..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for slrnpull
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=226212618dbe63715501d1368546056d
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20190609-r1
deleted file mode 100644
index d366a980e787..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for smartmon
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a515dac305a333c5386e1fa6aa10a4e3
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20190609-r1
deleted file mode 100644
index a779a26dc89a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for smokeping
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=10537e3420c819d5fd69bf948c8c0e6a
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20190609-r1
deleted file mode 100644
index b7491b707770..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-snmp-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for snmp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=dd8813fcddaa671224b793d697b071d4
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-snort-2.20190609-r1
deleted file mode 100644
index b92655ecbdc4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-snort-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for snort
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=241552533c15eb5ebb1d50eac5ea2a28
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20190609-r1
deleted file mode 100644
index 79df0fe3c4c7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for soundserver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=4ddfae103b5209bfbbe1692408923b9e
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20190609-r1
deleted file mode 100644
index d68611a0c95a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for spamassassin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=15c3275adcdf680feafe84bc92cb1834
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20190609-r1
deleted file mode 100644
index 68cc043069b6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for speedtouch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=831ef3ee8032de4f8895f0c249b3e7b5
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-9999 b/metadata/md5-cache/sec-policy/selinux-speedtouch-9999
deleted file mode 100644
index f658b6a962a8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
-DESCRIPTION=SELinux policy for speedtouch
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
-SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=454bce532523a0922fc5c0c3f74f5fb6
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-squid-2.20190609-r1
deleted file mode 100644
index 39f1c6319ef0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-squid-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for squid
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=561109f2ab1554b14e432be307c61db7
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20190609-r1
deleted file mode 100644
index c2e6cc972dc6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sssd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sssd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a2cba9a93de153b6c8f0fd3b7fc19578
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20190609-r1
deleted file mode 100644
index a2d0879f590f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for stunnel
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=2c360be3b0f5ce516246e7aa34069c28
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20190609-r1
deleted file mode 100644
index 6b5f2f5bc028..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for subsonic
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=940a7144ac0575bc6b86a1e0cb2c0942
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20190609-r1
deleted file mode 100644
index ebd6ea161b96..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sudo-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sudo
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=ef5879c0ab02036015d6c2aa089fa3db
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20190609-r1
deleted file mode 100644
index 34eeef5fb35f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sxid-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sxid
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b6285f4de9d9904ce09c1cd2a3695152
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20190609-r1
deleted file mode 100644
index 5e90e17a3a80..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for syncthing
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=f9ab2c03e999d7d10d6434079e4e40f4
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20190609-r1
deleted file mode 100644
index 5871f15439a1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sysstat
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=e3e846c32b57174ad370e6617eb1f04a
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20190609-r1
deleted file mode 100644
index 49b731b6e639..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tboot-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tboot
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5ccf2003176127a9b8ad29a84a77d7e9
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20190609-r1
deleted file mode 100644
index eaea56b462b0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tcpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=9c7749ba99f6754689bff4c3088f9c9f
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20190609-r1
deleted file mode 100644
index ab42d349b909..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tcsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5ef6f77135005dc72c5fd8b790dc287d
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20190609-r1
deleted file mode 100644
index a01b4250508b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-telnet-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for telnet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6b71bc3d75d1764b6ea02386fcb48930
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20190609-r1
deleted file mode 100644
index dba3941fa2ba..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tftp-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tftp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=76a6407e99aaea86f755f8e998e5f3c6
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20190609-r1
deleted file mode 100644
index 598c1e5b99c6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tgtd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=9df39a56adc20e081ad6e4ce57ea0bfe
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20190609-r1
deleted file mode 100644
index 811b1e62cad3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for thunderbird
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=399d6c8600a3e64a5f923d20b4ebf489
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20190609-r1
deleted file mode 100644
index 4e7d2a16a2e9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-timidity-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for timidity
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=7b2cc64d74a36adf95e9f61842c22af7
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20190609-r1
deleted file mode 100644
index 7f25f1630291..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tmpreaper
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a0b113e501aa3093303eebe70cb33d6a
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-tor-2.20190609-r1
deleted file mode 100644
index b4630169db0b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tor-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=4e9a6975443810607b49b83656cbdeb3
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20190609-r1
deleted file mode 100644
index baff8513cc9d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tripwire
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=83b201024b7b7aa72d064dd601edfd23
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20190609-r1
deleted file mode 100644
index 475779c1e646..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ucspitcp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=d7abe097b970beda1545b9bc7c8b0bdc
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20190609-r1
deleted file mode 100644
index 05e1b096da22..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ulogd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a74a9431871e0c4c957d07a1d559eaff
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-uml-2.20190609-r1
deleted file mode 100644
index b6bbc9810866..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uml-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uml
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c860e77fb56f3f6e4e45f4d09739ede0
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20190609-r1
deleted file mode 100644
index 4b74e7d21039..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for unconfined
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5168f876cc7683539da5b30df319da5f
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20190609-r1
deleted file mode 100644
index c67623e76b21..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uptime-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uptime
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=76ac9471f51b1e5bfb9ac365a0e7954d
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20190609-r1
deleted file mode 100644
index 21c7efd27d27..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for usbmuxd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=44e24d91509fe5cbcbc5f3b60d51a99c
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20190609-r1
deleted file mode 100644
index 94de787f46dd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uucp-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uucp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=52e26bdfa25dbc15371a72a4271e6ae6
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20190609-r1
deleted file mode 100644
index f72ed845bc2e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uwimap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=dd283b2e1edb197ae0d4911eba52a1a8
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20190609-r1
deleted file mode 100644
index 944a386828f7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uWSGI
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=dfd8201457ad155db072f126f06855b3
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20190609-r1
deleted file mode 100644
index c9558fcae503..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for varnishd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6942b872fa71b11a1b46d34edd05755e
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20190609-r1
deleted file mode 100644
index 4c1ac7b5a608..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vbetool
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=99d9a05f53ac31fb97a8c0eb8f6f9caf
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20190609-r1
deleted file mode 100644
index de00e499853d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vdagent
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6be8b32d523028bb6ce0dbc270643042
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-vde-2.20190609-r1
deleted file mode 100644
index 3bcdc44f4fd2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vde-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vde
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=55ac30a112746b227f94b0fa15a88299
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-virt-2.20190609-r1
deleted file mode 100644
index 1370aafe93cd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-virt-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for virt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=56cda99d89a39f7ccb08a4b289b64cf3
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20190609-r1
deleted file mode 100644
index a8693644b313..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vlock-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vlock
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=444da282aa5d82c72a75334699901d65
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20190609-r1
deleted file mode 100644
index 7f84c760bc7a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vmware-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vmware
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a2b3d30a7e444eb3f94fb5cc1cdfb344
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20190609-r1
deleted file mode 100644
index 273ee456baaa..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vnstatd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=1f305a9f9ac994b7526bc8a9eae4e8aa
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20190609-r1
deleted file mode 100644
index 6c8a535250e7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vpn-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vpn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=7d2b6390f9bb228039285d3e5e0813f3
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20190609-r1
deleted file mode 100644
index 3d066dd28492..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for watchdog
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=ee870576d768aca0fb863dbbb3271f52
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20190609-r1
deleted file mode 100644
index 5f0de5f7a64d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for webalizer
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3d76d8d25c85836f14c4e25beedbf576
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-wine-2.20190609-r1
deleted file mode 100644
index 54b905f1bb61..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wine-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wine
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=66421196612f3aeaba72e99bb43cfe34
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20190609-r1
deleted file mode 100644
index b6c91724be08..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wireshark
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a49a6e9334fce266115bc6ec616bef9c
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-wm-2.20190609-r1
deleted file mode 100644
index 341fdab3562d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wm-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=0908f208225e61b51804fc247ab07e40
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-xen-2.20190609-r1
deleted file mode 100644
index 83a21dbe73c0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xen-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xen
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=0e8556e2dbb84c967cddb9c37ef7c7a5
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20190609-r1
deleted file mode 100644
index 1970bd8c88bd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xfs-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xfs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=90ff68ddecd5ddfd33152bfa00d22b41
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20190609-r1
deleted file mode 100644
index 11b0bbd723be..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xprint-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xprint
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=2fb9a98c81bad957ceaa24a3056a003c
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-9999 b/metadata/md5-cache/sec-policy/selinux-xprint-9999
deleted file mode 100644
index bc906db726f6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xprint-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
-DESCRIPTION=SELinux policy for xprint
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
-SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=213f12c1270c543b5eb703d7f59594a5
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20190609-r1
deleted file mode 100644
index defa5591d89e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xscreensaver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=2fe695b74866df5f2d489cf5cc11bfc1
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20190609-r1
deleted file mode 100644
index 2bd90c8b4c08..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xserver-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xserver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=08ba563e225cc6ee06bb709f619eac1d
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20190609-r1 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20190609-r1
deleted file mode 100644
index 74d787a02abd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20190609-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for zabbix
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190609-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609/refpolicy-2.20190609.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2
-_eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=0ffec6111f407a383744bb6bd0e43f6a
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 3aaa1166a612..6e2d2c257991 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/logwatch-7.5.5 b/metadata/md5-cache/sys-apps/logwatch-7.5.5
new file mode 100644
index 000000000000..f2e48ec812f9
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/logwatch-7.5.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Analyzes and Reports on system logs
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/logwatch/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=virtual/cron virtual/mta virtual/mailx dev-lang/perl dev-perl/Date-Calc dev-perl/Date-Manip dev-perl/Tie-IxHash dev-perl/Sys-CPU dev-perl/Sys-MemInfo virtual/tmpfiles
+SLOT=0
+SRC_URI=mirror://sourceforge/logwatch/logwatch-7.5.5/logwatch-7.5.5.tar.gz
+_eclasses_=tmpfiles	6170dc7770585fb3f16efdee789a3218
+_md5_=b7acf8d4961f415a1e80a6ffd2244aee
diff --git a/metadata/md5-cache/sys-apps/miller-5.10.0 b/metadata/md5-cache/sys-apps/miller-5.10.0
index fe51bab4e95d..bfda28405a29 100644
--- a/metadata/md5-cache/sys-apps/miller-5.10.0
+++ b/metadata/md5-cache/sys-apps/miller-5.10.0
@@ -5,10 +5,10 @@ DESCRIPTION=A tool like sed, awk, cut, join, and sort for name-indexed data (CSV
 EAPI=7
 HOMEPAGE=https://johnkerl.org/miller/doc/index.html
 IUSE=doc test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=BSD-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/johnkerl/miller/archive/v5.10.0.tar.gz -> miller-5.10.0.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f555d99925ae8f9b204e123446dc037a
+_md5_=754480a9ed75dcb3399312cd4e6a347a
diff --git a/metadata/md5-cache/sys-apps/rng-tools-6.11 b/metadata/md5-cache/sys-apps/rng-tools-6.11
new file mode 100644
index 000000000000..aa9f1b6744dc
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/rng-tools-6.11
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-fs/sysfsutils jitterentropy? ( app-crypt/jitterentropy:= ) nistbeacon? ( dev-libs/jansson dev-libs/libxml2:2= net-misc/curl[ssl] ) pkcs11? ( dev-libs/libp11:= ) elibc_musl? ( sys-libs/argp-standalone )
+DESCRIPTION=Daemon to use hardware random number generators
+EAPI=7
+HOMEPAGE=https://github.com/nhorman/rng-tools
+IUSE=jitterentropy libressl nistbeacon pkcs11 selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-fs/sysfsutils jitterentropy? ( app-crypt/jitterentropy:= ) nistbeacon? ( dev-libs/jansson dev-libs/libxml2:2= net-misc/curl[ssl] ) pkcs11? ( dev-libs/libp11:= ) elibc_musl? ( sys-libs/argp-standalone ) selinux? ( sec-policy/selinux-rngd )
+SLOT=0
+SRC_URI=https://github.com/nhorman/rng-tools/archive/v6.11.tar.gz -> rng-tools-6.11.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=dfdf82d13d6a12859a3427680d91ceb9
diff --git a/metadata/md5-cache/sys-apps/sysvinit-2.98-r1 b/metadata/md5-cache/sys-apps/sysvinit-2.98-r1
index 0d386a7bb1e3..6d8f0b46b565 100644
--- a/metadata/md5-cache/sys-apps/sysvinit-2.98-r1
+++ b/metadata/md5-cache/sys-apps/sysvinit-2.98-r1
@@ -4,10 +4,10 @@ DESCRIPTION=/sbin/init - parent of all processes
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/sysvinit
 IUSE=selinux ibm static kernel_FreeBSD
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) selinux? ( sec-policy/selinux-shutdown ) !<sys-apps/openrc-0.13
 SLOT=0
 SRC_URI=mirror://nongnu/sysvinit/sysvinit-2.98.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9db3e0fc028e71ca47c6d2fbb1208d5d
+_md5_=497b37122a8f1cefd68840a09d0860b6
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 09fc173e1c61..225c87c3f695 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/pambase-20210201 b/metadata/md5-cache/sys-auth/pambase-20210201
new file mode 100644
index 000000000000..03b0cd3ae945
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/pambase-20210201
@@ -0,0 +1,15 @@
+BDEPEND=|| ( ( dev-lang/python:3.9 dev-python/jinja[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/jinja[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/jinja[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) )
+DEFINED_PHASES=configure install postinst setup test
+DESCRIPTION=PAM base configuration files
+EAPI=7
+HOMEPAGE=https://github.com/gentoo/pambase
+IUSE=caps debug elogind gnome-keyring homed minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=sys-libs/pam-1.4.0 elogind? ( sys-auth/elogind[pam] ) gnome-keyring? ( gnome-base/gnome-keyring[pam] ) mktemp? ( sys-auth/pam_mktemp ) pam_krb5? ( >=sys-libs/pam-1.4.0 sys-auth/pam_krb5 ) caps? ( sys-libs/libcap[pam] ) pam_ssh? ( sys-auth/pam_ssh ) passwdqc? ( >=sys-auth/passwdqc-1.4.0-r1 ) pwquality? ( dev-libs/libpwquality[pam] ) selinux? ( sys-libs/pam[selinux] ) sha512? ( >=sys-libs/pam-1.4.0 ) homed? ( sys-apps/systemd[homed] ) systemd? ( sys-apps/systemd[pam] )
+REQUIRED_USE=?? ( elogind systemd ) ?? ( passwdqc pwquality ) pwhistory? ( || ( passwdqc pwquality ) ) homed? ( !pam_krb5 ) pam_krb5? ( !homed )
+RESTRICT=binchecks
+SLOT=0
+SRC_URI=https://github.com/gentoo/pambase/archive/pambase-20210201.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=45def62910fb6532be92d3dad7badb23
diff --git a/metadata/md5-cache/sys-auth/pambase-999999999 b/metadata/md5-cache/sys-auth/pambase-999999999
index c136f93d15e8..12eb33cd555e 100644
--- a/metadata/md5-cache/sys-auth/pambase-999999999
+++ b/metadata/md5-cache/sys-auth/pambase-999999999
@@ -3,12 +3,12 @@ DEFINED_PHASES=configure install postinst setup test unpack
 DESCRIPTION=PAM base configuration files
 EAPI=7
 HOMEPAGE=https://github.com/gentoo/pambase
-IUSE=caps debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd
+IUSE=caps debug elogind gnome-keyring homed minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=>=sys-libs/pam-1.4.0 elogind? ( sys-auth/elogind[pam] ) gnome-keyring? ( gnome-base/gnome-keyring[pam] ) mktemp? ( sys-auth/pam_mktemp ) pam_krb5? ( >=sys-libs/pam-1.4.0 sys-auth/pam_krb5 ) caps? ( sys-libs/libcap[pam] ) pam_ssh? ( sys-auth/pam_ssh ) passwdqc? ( >=sys-auth/passwdqc-1.4.0-r1 ) pwquality? ( dev-libs/libpwquality[pam] ) selinux? ( sys-libs/pam[selinux] ) sha512? ( >=sys-libs/pam-1.4.0 ) systemd? ( sys-apps/systemd[pam] )
-REQUIRED_USE=?? ( elogind systemd ) ?? ( passwdqc pwquality ) pwhistory? ( || ( passwdqc pwquality ) )
+RDEPEND=>=sys-libs/pam-1.4.0 elogind? ( sys-auth/elogind[pam] ) gnome-keyring? ( gnome-base/gnome-keyring[pam] ) mktemp? ( sys-auth/pam_mktemp ) pam_krb5? ( >=sys-libs/pam-1.4.0 sys-auth/pam_krb5 ) caps? ( sys-libs/libcap[pam] ) pam_ssh? ( sys-auth/pam_ssh ) passwdqc? ( >=sys-auth/passwdqc-1.4.0-r1 ) pwquality? ( dev-libs/libpwquality[pam] ) selinux? ( sys-libs/pam[selinux] ) sha512? ( >=sys-libs/pam-1.4.0 ) homed? ( sys-apps/systemd[homed] ) systemd? ( sys-apps/systemd[pam] )
+REQUIRED_USE=?? ( elogind systemd ) ?? ( passwdqc pwquality ) pwhistory? ( || ( passwdqc pwquality ) ) homed? ( !pam_krb5 ) pam_krb5? ( !homed )
 RESTRICT=binchecks
 SLOT=0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9e1d63a6924c68aa03e5fc339df7ba9c
+_md5_=9e895c81b48d82ab61e288756eea7738
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 36737be7a196..71933a3993fd 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/fio-3.20-r2 b/metadata/md5-cache/sys-block/fio-3.20-r2
index aa715977aa83..2edfd409fb74 100644
--- a/metadata/md5-cache/sys-block/fio-3.20-r2
+++ b/metadata/md5-cache/sys-block/fio-3.20-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Jens Axboe's Flexible IO tester
 EAPI=7
 HOMEPAGE=https://brick.kernel.dk/snaps/
 IUSE=aio curl glusterfs gnuplot gtk libressl io-uring numa python rbd rdma static tcmalloc test zbc zlib python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 arm ~arm64 ~ia64 ~ppc ppc64 x86
+KEYWORDS=amd64 arm ~arm64 ~ia64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=!static? ( aio? ( dev-libs/libaio ) curl? ( net-misc/curl:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 ) io-uring? ( sys-libs/liburing:= ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) rdma? ( sys-fabric/libibverbs sys-fabric/librdmacm ) tcmalloc? ( dev-util/google-perftools:= ) zbc? ( >=sys-block/libzbc-5 ) zlib? ( sys-libs/zlib ) ) gtk? ( x11-libs/gtk+:2 ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] || ( ( dev-lang/python:3.8 dev-python/pandas[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/pandas[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) gnuplot? ( sci-visualization/gnuplot )
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) ) libressl? ( curl ) gnuplot? ( python ) io-uring? ( aio )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://brick.kernel.dk/snaps/fio-3.20.tar.bz2
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b9f8a55fdf2661f70168d498855ee321
+_md5_=4d394ed453cd8021775870fd13c5c21b
diff --git a/metadata/md5-cache/sys-block/libzbc-5.5.1 b/metadata/md5-cache/sys-block/libzbc-5.5.1
index c596381852c4..4cb901200d78 100644
--- a/metadata/md5-cache/sys-block/libzbc-5.5.1
+++ b/metadata/md5-cache/sys-block/libzbc-5.5.1
@@ -4,9 +4,9 @@ DESCRIPTION=A library and tools for working with ZBC and ZAC disks
 EAPI=6
 HOMEPAGE=https://github.com/hgst/libzbc
 IUSE=gtk
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86
 LICENSE=BSD-2 GPL-3 LGPL-3
 SLOT=0
 SRC_URI=https://github.com/hgst/libzbc/archive/v5.5.1.tar.gz -> libzbc-5.5.1.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c864946e994cb4ea500e0f5ed62b4041
+_md5_=38af60230b36a2183fddf32eb5f0204f
diff --git a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.9.0 b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.9.0
index 94097c684ba8..17d501696807 100644
--- a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.9.0
+++ b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.9.0
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!static? ( dev-libs/expat dev-libs/libaio ) static? ( dev-libs/expat[static-libs(+)] dev-libs/libaio[static-libs(+)] ) test? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) >=dev-cpp/gtest-1.8.0 dev-util/cucumber dev-util/aruba ) dev-libs/boost
+DEPEND=!static? ( dev-libs/expat dev-libs/libaio dev-libs/boost:= ) static? ( dev-libs/expat[static-libs(+)] dev-libs/libaio[static-libs(+)] dev-libs/boost:=[static-libs(+)] ) test? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) >=dev-cpp/gtest-1.8.0 dev-util/cucumber dev-util/aruba )
 DESCRIPTION=A suite of tools for thin provisioning on Linux
 EAPI=7
 HOMEPAGE=https://github.com/jthornber/thin-provisioning-tools
 IUSE=static test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=!static? ( dev-libs/expat dev-libs/libaio )
+RDEPEND=!static? ( dev-libs/expat dev-libs/libaio dev-libs/boost:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jthornber/thin-provisioning-tools/archive/v0.9.0.tar.gz -> thin-provisioning-tools-0.9.0.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=212250fa0e7d3b8fa1a2cc488ed9abba
+_md5_=74a44ab33927ffc6ac810d0222ef18cb
diff --git a/metadata/md5-cache/sys-block/thin-provisioning-tools-9999 b/metadata/md5-cache/sys-block/thin-provisioning-tools-9999
index 9829659cc73b..f08fef342f8e 100644
--- a/metadata/md5-cache/sys-block/thin-provisioning-tools-9999
+++ b/metadata/md5-cache/sys-block/thin-provisioning-tools-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!static? ( dev-libs/expat dev-libs/libaio ) static? ( dev-libs/expat[static-libs(+)] dev-libs/libaio[static-libs(+)] ) test? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) >=dev-cpp/gtest-1.8.0 dev-util/cucumber dev-util/aruba ) dev-libs/boost
+DEPEND=!static? ( dev-libs/expat dev-libs/libaio dev-libs/boost:= ) static? ( dev-libs/expat[static-libs(+)] dev-libs/libaio[static-libs(+)] dev-libs/boost:=[static-libs(+)] ) test? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) >=dev-cpp/gtest-1.8.0 dev-util/cucumber dev-util/aruba )
 DESCRIPTION=A suite of tools for thin provisioning on Linux
 EAPI=7
 HOMEPAGE=https://github.com/jthornber/thin-provisioning-tools
 IUSE=static test
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=!static? ( dev-libs/expat dev-libs/libaio )
+RDEPEND=!static? ( dev-libs/expat dev-libs/libaio dev-libs/boost:= )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=212250fa0e7d3b8fa1a2cc488ed9abba
+_md5_=74a44ab33927ffc6ac810d0222ef18cb
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index efaaf5594318..9547251470ea 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/compsize-1.3 b/metadata/md5-cache/sys-fs/compsize-1.3
index 2e4861385892..d4a7eb47e137 100644
--- a/metadata/md5-cache/sys-fs/compsize-1.3
+++ b/metadata/md5-cache/sys-fs/compsize-1.3
@@ -5,8 +5,8 @@ EAPI=7
 HOMEPAGE=https://github.com/kilobyte/compsize
 IUSE=debug
 KEYWORDS=amd64 x86
-LICENSE=GPL-2+
+LICENSE=GPL-2+ GPL-2
 SLOT=0
 SRC_URI=https://github.com/kilobyte/compsize/archive/v1.3.tar.gz -> compsize-1.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=62c6a8a37dc51c7c774732cdbebbb497
+_md5_=0150595ece9ee463035179655b0eda62
diff --git a/metadata/md5-cache/sys-fs/compsize-1.4 b/metadata/md5-cache/sys-fs/compsize-1.4
new file mode 100644
index 000000000000..5ec0d7fa6b7c
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/compsize-1.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-fs/btrfs-progs
+DESCRIPTION=Utility to find btrfs compression type/ratio on a file or set of files
+EAPI=7
+HOMEPAGE=https://github.com/kilobyte/compsize
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ GPL-2
+SLOT=0
+SRC_URI=https://github.com/kilobyte/compsize/archive/v1.4.tar.gz -> compsize-1.4.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b287aad42c2fd6bf7573c7837c92b41b
diff --git a/metadata/md5-cache/sys-fs/compsize-9999 b/metadata/md5-cache/sys-fs/compsize-9999
index 814f1e55d645..aa3f4ed48bc3 100644
--- a/metadata/md5-cache/sys-fs/compsize-9999
+++ b/metadata/md5-cache/sys-fs/compsize-9999
@@ -5,8 +5,8 @@ DESCRIPTION=Utility to find btrfs compression type/ratio on a file or set of fil
 EAPI=7
 HOMEPAGE=https://github.com/kilobyte/compsize
 IUSE=debug
-LICENSE=GPL-2+
+LICENSE=GPL-2+ GPL-2
 PROPERTIES=live
 SLOT=0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=71cfda633f3cf90a342821f0cd33a8a3
+_md5_=b287aad42c2fd6bf7573c7837c92b41b
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 062bfb299427..188378349a32 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.11_rc6 b/metadata/md5-cache/sys-kernel/git-sources-5.11_rc6
new file mode 100644
index 000000000000..48975e759f38
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.11_rc6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.11_rc6
+SRC_URI=https://git.kernel.org/torvalds/p/v5.11-rc6/v5.10 -> patch-5.11-rc6.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=cc0c380790c46c4ebbbd8329b2938991
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 54e1926da635..2b5d116850f9 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/glibc-2.33 b/metadata/md5-cache/sys-libs/glibc-2.33
new file mode 100644
index 000000000000..969f02f2490d
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/glibc-2.33
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers sys-devel/gnuconfig
+DESCRIPTION=GNU libc C library
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/libc/
+IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla
+LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
+PDEPEND=!vanilla? ( sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RESTRICT=!test? ( test )
+SLOT=2.2
+SRC_URI=mirror://gnu/glibc/glibc-2.33.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.33-patches-1.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ad018e965690eb84208a7f9e5db98999
diff --git a/metadata/md5-cache/sys-libs/kpmcore-4.2.0 b/metadata/md5-cache/sys-libs/kpmcore-4.2.0
index a8614f1ab23c..7e99ef3f2deb 100644
--- a/metadata/md5-cache/sys-libs/kpmcore-4.2.0
+++ b/metadata/md5-cache/sys-libs/kpmcore-4.2.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/10
 SRC_URI=mirror://kde/stable/kpmcore/4.2.0/src/kpmcore-4.2.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	8a81008797ecdb979e3100d782ab5513	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7450b0eda1787b6924b562669baec8ea
+_md5_=ba1e452dcbca6dd99e44f06d420059a1
diff --git a/metadata/md5-cache/sys-libs/ncurses-6.2_p20210123 b/metadata/md5-cache/sys-libs/ncurses-6.2_p20210123
new file mode 100644
index 000000000000..7bf50276b68a
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ncurses-6.2_p20210123
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=console display library
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/
+IUSE=ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+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
+LICENSE=MIT
+RDEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<=sys-libs/ncurses-5.9-r4:5 !<sys-libs/slang-2.3.2_pre23 !<x11-terms/rxvt-unicode-9.06-r3 !<x11-terms/st-0.6-r1
+RESTRICT=!test? ( test )
+SLOT=0/6
+SRC_URI=mirror://gnu/ncurses/ncurses-6.2.tar.gz https://dev.gentoo.org/~polynomial-c/dist/ncurses-6.2_p20210123.patch.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=78fd5f25e29e04fbbf2af324e8a9b452
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 7503e77fa3e3..1ffc49c624f1 100644
Binary files a/metadata/md5-cache/sys-power/Manifest.gz and b/metadata/md5-cache/sys-power/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-power/uhubctl-2.3.0 b/metadata/md5-cache/sys-power/uhubctl-2.3.0
new file mode 100644
index 000000000000..35f2868ac21d
--- /dev/null
+++ b/metadata/md5-cache/sys-power/uhubctl-2.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile prepare
+DEPEND=virtual/libusb:1
+DESCRIPTION=USB hub per-port power control
+EAPI=7
+HOMEPAGE=https://github.com/mvp/uhubctl
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/libusb:1
+SLOT=0
+SRC_URI=https://github.com/mvp/uhubctl/archive/v2.3.0.tar.gz -> uhubctl-2.3.0.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=326356aeac9c3cf3e45c1e9deccbfb30
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 22de6c76e1cd..b66050479b92 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/evisum-0.5.10 b/metadata/md5-cache/sys-process/evisum-0.5.10
new file mode 100644
index 000000000000..60d933d788c1
--- /dev/null
+++ b/metadata/md5-cache/sys-process/evisum-0.5.10
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/efl dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=System and process monitor written with EFL
+EAPI=7
+HOMEPAGE=https://www.enlightenment.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 ISC
+RDEPEND=|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
+SLOT=0
+SRC_URI=https://download.enlightenment.org/rel/apps/evisum/evisum-0.5.10.tar.xz
+_eclasses_=meson	fdaf2a7b9376934c1c7ddbd32114defb	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7812c6068d858c94a344b48b3293da40
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 720d14ab8961..63e5209b7814 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/nextcloud-20.0.5 b/metadata/md5-cache/www-apps/nextcloud-20.0.5
index a3a34b7ed7fd..43756ba8bc2c 100644
--- a/metadata/md5-cache/www-apps/nextcloud-20.0.5
+++ b/metadata/md5-cache/www-apps/nextcloud-20.0.5
@@ -4,11 +4,11 @@ DESCRIPTION=Personal cloud that runs on your own server
 EAPI=7
 HOMEPAGE=https://nextcloud.com/
 IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=AGPL-3
 RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=20.0.5
 SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-20.0.5.tar.bz2
 _eclasses_=webapp	1d03df021d958f89f4cc78e289d0b116
-_md5_=e405814e1a861beb2502be0282507b04
+_md5_=009d047a01ec06bacccbbab50ab64c2a
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 74e7ff161d05..58b272605a7f 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/firefox-84.0.2 b/metadata/md5-cache/www-client/firefox-84.0.2
deleted file mode 100644
index 9ec2d0a9e0c1..000000000000
--- a/metadata/md5-cache/www-client/firefox-84.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] dev-lang/python:3.7[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.15.0 >=net-libs/nodejs-10.22.1 virtual/pkgconfig >=virtual/rust-1.44.0 || ( ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 sys-devel/llvm:9 clang? ( =sys-devel/lld-9* pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.59.1 >=dev-libs/nspr-4.29 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Firefox Web Browser
-EAPI=7
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.59.1 >=dev-libs/nspr-4.29 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
-SLOT=0/84
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/84.0.2/source/firefox-84.0.2.source.tar.xz -> firefox-84.0.2.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-84-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-84-patches-02.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-84-patches-02.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ach.xpi -> firefox-84.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/af.xpi -> firefox-84.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/an.xpi -> firefox-84.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ar.xpi -> firefox-84.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ast.xpi -> firefox-84.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/az.xpi -> firefox-84.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/be.xpi -> firefox-84.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/bg.xpi -> firefox-84.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/bn.xpi -> firefox-84.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/br.xpi -> firefox-84.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/bs.xpi -> firefox-84.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-84.0.2-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ca.xpi -> firefox-84.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/cak.xpi -> firefox-84.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/cs.xpi -> firefox-84.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/cy.xpi -> firefox-84.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/da.xpi -> firefox-84.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/de.xpi -> firefox-84.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-84.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/el.xpi -> firefox-84.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-84.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-84.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/eo.xpi -> firefox-84.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-84.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-84.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-84.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-84.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/et.xpi -> firefox-84.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/eu.xpi -> firefox-84.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/fa.xpi -> firefox-84.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ff.xpi -> firefox-84.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/fi.xpi -> firefox-84.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/fr.xpi -> firefox-84.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-84.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-84.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/gd.xpi -> firefox-84.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/gl.xpi -> firefox-84.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/gn.xpi -> firefox-84.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-84.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/he.xpi -> firefox-84.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-84.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/hr.xpi -> firefox-84.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-84.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/hu.xpi -> firefox-84.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-84.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ia.xpi -> firefox-84.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/id.xpi -> firefox-84.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/is.xpi -> firefox-84.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/it.xpi -> firefox-84.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ja.xpi -> firefox-84.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ka.xpi -> firefox-84.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/kab.xpi -> firefox-84.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/kk.xpi -> firefox-84.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/km.xpi -> firefox-84.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/kn.xpi -> firefox-84.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ko.xpi -> firefox-84.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/lij.xpi -> firefox-84.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/lt.xpi -> firefox-84.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/lv.xpi -> firefox-84.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/mk.xpi -> firefox-84.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/mr.xpi -> firefox-84.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ms.xpi -> firefox-84.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/my.xpi -> firefox-84.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-84.0.2-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-84.0.2-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/nl.xpi -> firefox-84.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-84.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/oc.xpi -> firefox-84.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-84.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/pl.xpi -> firefox-84.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-84.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-84.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/rm.xpi -> firefox-84.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ro.xpi -> firefox-84.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ru.xpi -> firefox-84.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/si.xpi -> firefox-84.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/sk.xpi -> firefox-84.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/sl.xpi -> firefox-84.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/son.xpi -> firefox-84.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/sq.xpi -> firefox-84.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/sr.xpi -> firefox-84.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-84.0.2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ta.xpi -> firefox-84.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/te.xpi -> firefox-84.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/th.xpi -> firefox-84.0.2-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/tl.xpi -> firefox-84.0.2-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/tr.xpi -> firefox-84.0.2-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/trs.xpi -> firefox-84.0.2-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/uk.xpi -> firefox-84.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ur.xpi -> firefox-84.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/uz.xpi -> firefox-84.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/vi.xpi -> firefox-84.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/xh.xpi -> firefox-84.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-84.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-84.0.2-zh-TW.xpi )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f6f48320a1900ae472ff054b0fb173e9
diff --git a/metadata/md5-cache/www-client/firefox-85.0-r1 b/metadata/md5-cache/www-client/firefox-85.0-r1
new file mode 100644
index 000000000000..0539472eb61c
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-85.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] dev-lang/python:3.7[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.15.0 >=net-libs/nodejs-10.22.1 virtual/pkgconfig >=virtual/rust-1.47.0 || ( ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 sys-devel/llvm:9 clang? ( =sys-devel/lld-9* pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.60 >=dev-libs/nspr-4.29 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Firefox Web Browser
+EAPI=7
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.60 >=dev-libs/nspr-4.29 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
+SLOT=0/85
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/85.0/source/firefox-85.0.source.tar.xz -> firefox-85.0.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-85-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-85-patches-02.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-85-patches-02.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/ach.xpi -> firefox-85.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/af.xpi -> firefox-85.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/an.xpi -> firefox-85.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/ar.xpi -> firefox-85.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/ast.xpi -> firefox-85.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/az.xpi -> firefox-85.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/be.xpi -> firefox-85.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/bg.xpi -> firefox-85.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/bn.xpi -> firefox-85.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/br.xpi -> firefox-85.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/bs.xpi -> firefox-85.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-85.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/ca.xpi -> firefox-85.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/cak.xpi -> firefox-85.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/cs.xpi -> firefox-85.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/cy.xpi -> firefox-85.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/da.xpi -> firefox-85.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/de.xpi -> firefox-85.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/dsb.xpi -> firefox-85.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/el.xpi -> firefox-85.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/en-CA.xpi -> firefox-85.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/en-GB.xpi -> firefox-85.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/eo.xpi -> firefox-85.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/es-AR.xpi -> firefox-85.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/es-CL.xpi -> firefox-85.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/es-ES.xpi -> firefox-85.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/es-MX.xpi -> firefox-85.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/et.xpi -> firefox-85.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/eu.xpi -> firefox-85.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/fa.xpi -> firefox-85.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/ff.xpi -> firefox-85.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/fi.xpi -> firefox-85.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/fr.xpi -> firefox-85.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-85.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-85.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/gd.xpi -> firefox-85.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/gl.xpi -> firefox-85.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/gn.xpi -> firefox-85.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-85.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/he.xpi -> firefox-85.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-85.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/hr.xpi -> firefox-85.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/hsb.xpi -> firefox-85.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/hu.xpi -> firefox-85.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-85.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/ia.xpi -> firefox-85.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/id.xpi -> firefox-85.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/is.xpi -> firefox-85.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/it.xpi -> firefox-85.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/ja.xpi -> firefox-85.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/ka.xpi -> firefox-85.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/kab.xpi -> firefox-85.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/kk.xpi -> firefox-85.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/km.xpi -> firefox-85.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/kn.xpi -> firefox-85.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/ko.xpi -> firefox-85.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/lij.xpi -> firefox-85.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/lt.xpi -> firefox-85.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/lv.xpi -> firefox-85.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/mk.xpi -> firefox-85.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/mr.xpi -> firefox-85.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/ms.xpi -> firefox-85.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/my.xpi -> firefox-85.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-85.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-85.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/nl.xpi -> firefox-85.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-85.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/oc.xpi -> firefox-85.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-85.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/pl.xpi -> firefox-85.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-85.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-85.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/rm.xpi -> firefox-85.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/ro.xpi -> firefox-85.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/ru.xpi -> firefox-85.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/si.xpi -> firefox-85.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/sk.xpi -> firefox-85.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/sl.xpi -> firefox-85.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/son.xpi -> firefox-85.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/sq.xpi -> firefox-85.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/sr.xpi -> firefox-85.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-85.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/ta.xpi -> firefox-85.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/te.xpi -> firefox-85.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/th.xpi -> firefox-85.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/tl.xpi -> firefox-85.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/tr.xpi -> firefox-85.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/trs.xpi -> firefox-85.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/uk.xpi -> firefox-85.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/ur.xpi -> firefox-85.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/uz.xpi -> firefox-85.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/vi.xpi -> firefox-85.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/xh.xpi -> firefox-85.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-85.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-85.0-zh-TW.xpi )
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f81ebbf36c08797f783d9e045d9bc093
diff --git a/metadata/md5-cache/www-client/firefox-bin-84.0.2 b/metadata/md5-cache/www-client/firefox-bin-84.0.2
deleted file mode 100644
index c8528238fbd8..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-84.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Firefox Web Browser
-EAPI=7
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=strip
-SLOT=0/84
-SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/en-US/firefox-84.0.2.tar.bz2 -> firefox-bin_x86_64-84.0.2.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-i686/en-US/firefox-84.0.2.tar.bz2 -> firefox-bin_i686-84.0.2.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ach.xpi -> firefox-84.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/af.xpi -> firefox-84.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/an.xpi -> firefox-84.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ar.xpi -> firefox-84.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ast.xpi -> firefox-84.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/az.xpi -> firefox-84.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/be.xpi -> firefox-84.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/bg.xpi -> firefox-84.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/bn.xpi -> firefox-84.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/br.xpi -> firefox-84.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/bs.xpi -> firefox-84.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-84.0.2-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ca.xpi -> firefox-84.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/cak.xpi -> firefox-84.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/cs.xpi -> firefox-84.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/cy.xpi -> firefox-84.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/da.xpi -> firefox-84.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/de.xpi -> firefox-84.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-84.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/el.xpi -> firefox-84.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-84.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-84.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/eo.xpi -> firefox-84.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-84.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-84.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-84.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-84.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/et.xpi -> firefox-84.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/eu.xpi -> firefox-84.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/fa.xpi -> firefox-84.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ff.xpi -> firefox-84.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/fi.xpi -> firefox-84.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/fr.xpi -> firefox-84.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-84.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-84.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/gd.xpi -> firefox-84.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/gl.xpi -> firefox-84.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/gn.xpi -> firefox-84.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-84.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/he.xpi -> firefox-84.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-84.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/hr.xpi -> firefox-84.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-84.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/hu.xpi -> firefox-84.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-84.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ia.xpi -> firefox-84.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/id.xpi -> firefox-84.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/is.xpi -> firefox-84.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/it.xpi -> firefox-84.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ja.xpi -> firefox-84.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ka.xpi -> firefox-84.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/kab.xpi -> firefox-84.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/kk.xpi -> firefox-84.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/km.xpi -> firefox-84.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/kn.xpi -> firefox-84.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ko.xpi -> firefox-84.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/lij.xpi -> firefox-84.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/lt.xpi -> firefox-84.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/lv.xpi -> firefox-84.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/mk.xpi -> firefox-84.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/mr.xpi -> firefox-84.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ms.xpi -> firefox-84.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/my.xpi -> firefox-84.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-84.0.2-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-84.0.2-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/nl.xpi -> firefox-84.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-84.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/oc.xpi -> firefox-84.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-84.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/pl.xpi -> firefox-84.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-84.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-84.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/rm.xpi -> firefox-84.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ro.xpi -> firefox-84.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ru.xpi -> firefox-84.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/si.xpi -> firefox-84.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/sk.xpi -> firefox-84.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/sl.xpi -> firefox-84.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/son.xpi -> firefox-84.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/sq.xpi -> firefox-84.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/sr.xpi -> firefox-84.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-84.0.2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ta.xpi -> firefox-84.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/te.xpi -> firefox-84.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/th.xpi -> firefox-84.0.2-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/tl.xpi -> firefox-84.0.2-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/tr.xpi -> firefox-84.0.2-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/trs.xpi -> firefox-84.0.2-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/uk.xpi -> firefox-84.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/ur.xpi -> firefox-84.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/uz.xpi -> firefox-84.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/vi.xpi -> firefox-84.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/xh.xpi -> firefox-84.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-84.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/84.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-84.0.2-zh-TW.xpi )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dfa8761fe8a182c31d47e474ccda49b1
diff --git a/metadata/md5-cache/www-client/opera-developer-75.0.3953.0 b/metadata/md5-cache/www-client/opera-developer-75.0.3953.0
new file mode 100644
index 000000000000..c17b446af190
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-75.0.3953.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=+proprietary-codecs suid widevine kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=OPERA-2018
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango widevine? ( www-plugins/chrome-binary-plugins )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://download1.operacdn.com/pub/opera-developer/75.0.3953.0/linux/opera-developer_75.0.3953.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/75.0.3953.0/linux/opera-developer_75.0.3953.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/75.0.3953.0/linux/opera-developer_75.0.3953.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/75.0.3953.0/linux/opera-developer_75.0.3953.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-89.0.4381.8.tar.xz )
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=74b7584560589858ad0c75c7fc55b9a1
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index b944bde39978..663234eeef8c 100644
Binary files a/metadata/md5-cache/x11-apps/Manifest.gz and b/metadata/md5-cache/x11-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-apps/xinit-1.4.1-r1 b/metadata/md5-cache/x11-apps/xinit-1.4.1-r1
index 5eb97b6d57e8..0b99f4d84d96 100644
--- a/metadata/md5-cache/x11-apps/xinit-1.4.1-r1
+++ b/metadata/md5-cache/x11-apps/xinit-1.4.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=X Window System initializer
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xinit
 IUSE=twm
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~arm-linux ~x86-linux
 LICENSE=MIT GPL-2
 PDEPEND=x11-apps/xrdb twm? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x11-wm/twm )
 RDEPEND=x11-apps/xauth x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xinit-1.4.1.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
-_md5_=c91203bbcf54f1da9c84d1701abb88f8
+_md5_=a5b0259f5ae069154695a84917f10e14
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index e875bc0c1eba..dbb511a0a6b0 100644
Binary files a/metadata/md5-cache/x11-base/Manifest.gz and b/metadata/md5-cache/x11-base/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.20.10-r1 b/metadata/md5-cache/x11-base/xorg-server-1.20.10-r1
index 20654443790c..4c92f4be7421 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.20.10-r1
+++ b/metadata/md5-cache/x11-base/xorg-server-1.20.10-r1
@@ -5,12 +5,12 @@ DESCRIPTION=X.Org X servers
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
 IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +elogind ipv6 libressl minimal selinux suid systemd +udev unwind xcsecurity doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.20 )
-RDEPEND=media-libs/libglvnd[X] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(-)] gui-libs/display-manager-init selinux? ( sec-policy/selinux-xserver )
+RDEPEND=media-libs/libglvnd[X] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(-)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver )
 REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) minimal? ( !wayland ) xephyr? ( kdrive )
 SLOT=0/1.20.10
 SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.10.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
-_md5_=8bb00b966dde3fcce3b140c3382f9f78
+_md5_=2657612ee6c9b805df6a29eb4de7c265
diff --git a/metadata/md5-cache/x11-base/xorg-server-9999 b/metadata/md5-cache/x11-base/xorg-server-9999
index 2734cfcace5f..7e20098f7954 100644
--- a/metadata/md5-cache/x11-base/xorg-server-9999
+++ b/metadata/md5-cache/x11-base/xorg-server-9999
@@ -8,8 +8,8 @@ IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +elogind ipv6 libressl mini
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-9999 )
 PROPERTIES=live
-RDEPEND=media-libs/libglvnd[X] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(-)] gui-libs/display-manager-init selinux? ( sec-policy/selinux-xserver )
+RDEPEND=media-libs/libglvnd[X] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(-)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver )
 REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) minimal? ( !wayland ) xephyr? ( kdrive )
 SLOT=0/9999
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
-_md5_=34789d4aeb8681a75b05c14b3165fb2b
+_md5_=6b36188fcc2d6f21ae984912ca9b2ec8
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 49b2c664e534..c74295a3922d 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/albert-0.17.2 b/metadata/md5-cache/x11-misc/albert-0.17.2
index 1fc28a2e8178..d1afce3e7df4 100644
--- a/metadata/md5-cache/x11-misc/albert-0.17.2
+++ b/metadata/md5-cache/x11-misc/albert-0.17.2
@@ -6,10 +6,11 @@ EAPI=7
 HOMEPAGE=https://albertlauncher.github.io/
 IUSE=debug +python +python-extensions +statistics virtualbox
 KEYWORDS=~amd64
-LICENSE=GPL-3+
+LICENSE=all-rights-reserved
 RDEPEND=dev-cpp/muParser dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 statistics? ( dev-qt/qtcharts:5 ) virtualbox? ( app-emulation/virtualbox[sdk] ) x11-libs/libX11
 REQUIRED_USE=python-extensions? ( python )
+RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://github.com/albertlauncher/albert/archive/v0.17.2.tar.gz -> albert-0.17.2.tar.gz https://github.com/albertlauncher/plugins/archive/b4cac28be7b265027b00279baba14086d97c4d07.tar.gz -> albert-0.17.2-plugins.tar.gz python? ( https://github.com/pybind/pybind11/archive/v2.6.1.tar.gz -> albert-0.17.2-pybind11-2.6.1.tar.gz ) python-extensions? ( https://github.com/albertlauncher/python/archive/7f571aceaf8e60eee8bb21e1ec4efa0e95523d13.tar.gz -> albert-0.17.2-python-extensions.tar.gz https://github.com/mqus/jetbrains-albert-plugin/archive/b7157473cc923fe4f15023c85a032eeab3627652.tar.gz -> albert-0.17.2-jetbrains-python-extension.tar.gz https://github.com/bergercookie/xkcd-albert-plugin/archive/bf88a964473d65b39c9e09eb48dabb847206f06f.tar.gz -> albert-0.17.2-xkcd-python-extension.tar.gz )
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3915a1053ab75db3bd540cb146e920de
+_md5_=3f3c0949335e9e8617e59d462d64b3ab
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index ee62054f8dfe..085687ab538a 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-unico-1.0.3_pre20140109-r1 b/metadata/md5-cache/x11-themes/gtk-engines-unico-1.0.3_pre20140109-r1
index 9d71a5a4f7cd..977611f8142d 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-unico-1.0.3_pre20140109-r1
+++ b/metadata/md5-cache/x11-themes/gtk-engines-unico-1.0.3_pre20140109-r1
@@ -5,10 +5,10 @@ DESCRIPTION=The Unico GTK+ 3.x theming engine
 EAPI=7
 HOMEPAGE=https://launchpad.net/unico
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.26:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.10[glib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-3.5.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/unico_1.0.3+14.04.20140109.orig.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=21fe9193a8b825cd7df910db6498a7ff
+_md5_=f57b3bfb274201dfacb41bd6bae82304
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 9a075a8abb3d..5ee9e1729927 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 10622 BLAKE2B 85f9df5ebacbcce5b27f130e5828e427ec3b0b0b202b302b92ae9965cc142b60674ec051923858aab27cd646d5789464ecc0460cb8bf31753e9a2c7050a67a2f SHA512 68c741776cccb75f3f77c8f6759b0ba05c454ec24d1bf8a9b517c6197ad78e126a079ce20c5f8e1e62e1f8284eeccbcf881e3b1a637e7b12b857c00823135ebd
-TIMESTAMP 2021-02-01T11:08:27Z
+TIMESTAMP 2021-02-02T06:08:30Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmAX4StfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmAY7F5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCZVg//UMxHJ1P34fYiRGUghk1zL6iRyNBxwaCqoDPItLwA6EOyb9SZxF7bI/rA
-bR8cDscOlh/MtbKxlVMr7jAzwXuwPjkRO0Vy/SaRAifAb/XsJvNOEuvwR2qO5iy3
-9pToXMWpBCyBmElnlOuviqhc3TtKFZmc6FYwRYkkmH8nEuMNpRhznI39n7FDWi4y
-pMNXe0kgIK3hPeeSNUxEX0orxZ4BXJxX9JxlpJg5gnsQHXCHqKAxSxY3ZpnzRRva
-CnT9DheF3zdXIoNkl8ywBkqUS56ai1fFdHpRpyuNXB13oKJTS6KQ+baQgrN6tKnL
-dKZ28rJvo7sAjkEfxFtCFN9gqoQjZg2evuu3IkgvBdlhbb5J+rLl2Gi1s1ZZnZpv
-rTM4GzdqWKzrrG4i6N0vExIqZc6EF5P7YJRncrYVK0v0UduSAP8gvGIaXC7OU59n
-6hQ1evIBy14kzbeWfZyqGZtBEjhmU8XdD5KAJ+CSMpDh5LzcagM/zAxCTHblsyNl
-dWEm1wbpSwqNdu4nwSGbb6NWgtC0qhTBf8cizVYlg/HNQrNf2rYXbiwN4ng5YDJT
-B2oaofQ+2Dw06ZZySfPeUBnfAVgiRYYHweUhvNBwBohUXqvQbsF/PUUSscywTcrO
-CJmnhCK9VoxYPZVaQd8Jt78Cx5DZkWLsV0dqT0pufU+r2pCBeQc=
-=z9bs
+klDReQ/+LRdnO+mHsCfvn2O0GUOXg65zI7tFKtD23LVDAxFvB/S+32VyAyKnlCUu
+5iO2FYTeUqwq8I1hzi0h2tJ1seQQvAEfvC5UrLM0czqMLS3FZA6Khw4AnIvETzR6
+NjKGo5bK2wujDdmEltHF4uZrPG0XTShE6ebtBKNHty7FV6Rd1hSrNZqHR4mG0DZD
+6P8xcXRqU81INoZXobkF0QpeGTIzJu3u+O0UNmpE+r8zKi+O+2kR8CrrxdfVBwkZ
+Kp9ZvNm4hX61IsStsNH1P3ruw6FWrDn98t+F9vf9N4g8uraVD8nzHHDWHNb+vdkG
+nkPaL5wXQGGI1lgqna2pL9XN6mJVKR7VVftkXMBNjczTVk0//teFQKH6YLYeqJWj
+mlbBmZc6kvYSb30J+XPWnY5/NVX8JJYO3lY29uMo5sv7LgiDTCdLfXt3E/FPEy0b
+I6JxgFga/CNLC6ZpsQb8Z4e8PQFA8IBxeoQ0Soyhi3AH/xj6Tz4tJlawKXsJHxJ6
+IBMH6fj13VN852sXbQ9dmp1VCTmRJS827ifQJ/bZ9vLDI7jinzU1wls+4A858Ia4
+LFchcQ0MgV8Yxdqx8xSK/NdhDxpGILD6GYuGh+LZ9U4NCMuvWdXJpxGgzXriRboM
+eRWiRS7C9Mx/iI6w6qT1osk4ejZCGATvqJAXslgsHEG+j6Qqr74=
+=za4e
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index c99e3d09773c..c1cf5c28dd4e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Feb 2021 11:08:24 +0000
+Tue, 02 Feb 2021 06:08:27 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index fc303d155d6e..043e2ae69e96 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -388,10 +388,6 @@
     <name>Biology Project</name>
     <url>https://wiki.gentoo.org/wiki/Project:Biology</url>
     <description>The Biology Project handles all biology related activities in Gentoo.</description>
-    <member>
-      <email>jlec@gentoo.org</email>
-      <name>Justin Lecher</name>
-    </member>
     <member>
       <email>pacho@gentoo.org</email>
       <name>Pacho Ramos</name>
@@ -475,10 +471,6 @@
       <email>alexxy@gentoo.org</email>
       <name>Alexey Shvetsov</name>
     </member>
-    <member>
-      <email>jlec@gentoo.org</email>
-      <name>Justin Lecher</name>
-    </member>
     <member>
       <email>nicolasbock@gentoo.org</email>
       <name>Nicolas Bock</name>
@@ -1081,10 +1073,6 @@
       <email>pacho@gentoo.org</email>
       <name>Pacho Ramos</name>
     </member>
-    <member>
-      <email>sobhan@gentoo.org</email>
-      <name>Sobhan Mohammadpour</name>
-    </member>
   </project>
   <project>
     <email>gnu-emacs@gentoo.org</email>
@@ -1186,11 +1174,6 @@
       <name>Matthew Marchese</name>
       <role>Merge man</role>
     </member>
-    <member>
-      <email>mudler@gentoo.org</email>
-      <name>Ettore Di Giacinto</name>
-      <role>Merge man</role>
-    </member>
     <member is-lead="1">
       <email>robbat2@gentoo.org</email>
       <name>Robin Johnson</name>
@@ -1831,10 +1814,6 @@
     <name>MATE Desktop</name>
     <url>https://wiki.gentoo.org/wiki/Project:MATE</url>
     <description>The MATE Project aims to bring the current and complete MATE Desktop Environment to Gentoo.</description>
-    <member>
-      <email>mudler@gentoo.org</email>
-      <name>Ettore Di Giacinto</name>
-    </member>
     <member is-lead="1">
       <email>NP-Hardass@gentoo.org</email>
       <name>NP-Hardass</name>
@@ -2181,10 +2160,6 @@
       <email>monsieurp@gentoo.org</email>
       <name>Patrice Clement</name>
     </member>
-    <member>
-      <email>mudler@gentoo.org</email>
-      <name>Ettore Di Giacinto</name>
-    </member>
     <member>
       <email>titanofold@gentoo.org</email>
       <name>Aaron W. Swenson</name>
@@ -3070,11 +3045,6 @@
       <name>Benda Xu</name>
       <role>Astronomy, Mathematics, Physics</role>
     </member>
-    <member is-lead="1">
-      <email>jlec@gentoo.org</email>
-      <name>Justin Lecher</name>
-      <role>Chemistry, Biology, *</role>
-    </member>
     <member>
       <email>marecki@gentoo.org</email>
       <name>Marek Szuba</name>
@@ -3461,10 +3431,6 @@
       <email>monsieurp@gentoo.org</email>
       <name>Patrice Clement</name>
     </member>
-    <member>
-      <email>tranquility@gentoo.org</email>
-      <name>Ole Reifschneider</name>
-    </member>
   </project>
   <project>
     <email>virtualization@gentoo.org</email>
diff --git a/metadata/timestamp b/metadata/timestamp
index dac5e122558f..045a952a47df 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Feb  1 11:08:24 AM UTC 2021
+Tue Feb  2 06:08:27 AM UTC 2021
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 2bf560b17b80..43bfb48cf757 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -808,7 +808,7 @@
 2101270439 ./app-admin/needrestart/needrestart-3.5.ebuild
 2101270439 ./app-admin/needrestart/needrestart-9999.ebuild
 2012311940 ./app-admin/newsyslog/newsyslog-1.1-r1.ebuild
-2101242239 ./app-admin/newsyslog/newsyslog-1.1.0.81-r1.ebuild
+2102011839 ./app-admin/newsyslog/newsyslog-1.1.0.81-r1.ebuild
 2101310343 ./app-admin/ngxtop/ngxtop-0.0.3_pre141201-r1.ebuild
 2101310343 ./app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild
 1905102109 ./app-admin/openrc-settingsd/openrc-settingsd-1.0.1-r1.ebuild
@@ -960,6 +960,8 @@
 2012201939 ./app-admin/selint/selint-1.1.0.ebuild
 2012031339 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.23.1.ebuild
 2101251809 ./app-admin/undertaker-scripts/undertaker-scripts-1.ebuild
+2102011639 ./app-admin/doctl/doctl-1.55.0.ebuild
+2102011639 ./app-admin/doctl/doctl-9999.ebuild
 2007171839 ./app-antivirus/clamav/clamav-0.102.4.ebuild
 2012180439 ./app-antivirus/clamav/clamav-0.103.0-r2.ebuild
 2101310343 ./app-antivirus/clamtk/clamtk-6.06.ebuild
@@ -1430,7 +1432,7 @@
 2101061609 ./app-crypt/libb2/libb2-0.98.1-r3.ebuild
 1910231539 ./app-crypt/libmd/libmd-99999.ebuild
 2012202239 ./app-crypt/libmd/libmd-1.0.1.ebuild
-2101030039 ./app-crypt/libmd/libmd-1.0.3.ebuild
+2102011639 ./app-crypt/libmd/libmd-1.0.3.ebuild
 2001091009 ./app-crypt/libnitrokey/libnitrokey-3.5.ebuild
 2101242039 ./app-crypt/libnitrokey/libnitrokey-3.6.ebuild
 2101242039 ./app-crypt/libnitrokey/libnitrokey-9999.ebuild
@@ -2321,6 +2323,7 @@
 2101161839 ./app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild
 2101161839 ./app-editors/notepadqq/notepadqq-9999.ebuild
 2010261709 ./app-editors/okteta/okteta-0.26.4.ebuild
+2102011709 ./app-editors/okteta/okteta-0.26.5.ebuild
 1709280402 ./app-editors/padre/padre-1.0.0-r1.ebuild
 2101310343 ./app-editors/pluma/pluma-1.24.0.ebuild
 2101310343 ./app-editors/pluma/pluma-1.24.1.ebuild
@@ -2751,8 +2754,8 @@
 2007110438 ./app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-5.0.0.ebuild
 2101310343 ./app-emulation/qemu/qemu-5.1.0-r3.ebuild
 2101310343 ./app-emulation/qemu/qemu-5.2.0-r1.ebuild
-2101311309 ./app-emulation/qemu/qemu-5.2.0-r2.ebuild
 2101311739 ./app-emulation/qemu/qemu-9999.ebuild
+2102012109 ./app-emulation/qemu/qemu-5.2.0-r2.ebuild
 1912100639 ./app-emulation/reg/reg-0.16.1.ebuild
 2010180409 ./app-emulation/runc/runc-1.0.0_rc10-r1.ebuild
 2101050239 ./app-emulation/runc/runc-1.0.0_rc92.ebuild
@@ -2856,12 +2859,16 @@
 1803270108 ./app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild
 2101310343 ./app-emulation/xen-pvgrub/xen-pvgrub-4.13.2.ebuild
 2101310343 ./app-emulation/xen-pvgrub/xen-pvgrub-4.14.0.ebuild
+2102012239 ./app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild
 2101310343 ./app-emulation/xen-tools/xen-tools-4.13.2-r1.ebuild
 2101310343 ./app-emulation/xen-tools/xen-tools-4.13.2-r2.ebuild
 2101310343 ./app-emulation/xen-tools/xen-tools-4.14.0-r5.ebuild
+2102012239 ./app-emulation/xen-tools/xen-tools-4.14.1.ebuild
 2101310343 ./app-emulation/xen/xen-4.13.2-r2.ebuild
 2101310343 ./app-emulation/xen/xen-4.13.2-r3.ebuild
 2101310343 ./app-emulation/xen/xen-4.14.0-r7.ebuild
+2102012239 ./app-emulation/xen/xen-4.13.2-r4.ebuild
+2102012239 ./app-emulation/xen/xen-4.14.1.ebuild
 2006280009 ./app-emulation/xtrs/xtrs-4.9d-r5.ebuild
 2101310343 ./app-emulation/crun/crun-0.15.ebuild
 2101310343 ./app-emulation/crun/crun-0.16.ebuild
@@ -4070,8 +4077,8 @@
 2007042139 ./app-text/cwtext/cwtext-0.96-r1.ebuild
 1910111840 ./app-text/dbacl/dbacl-1.14.1.ebuild
 2012231444 ./app-text/dbacl/dbacl-1.14.ebuild
-2101310343 ./app-text/dblatex/dblatex-0.3.11-r1.ebuild
 2101310343 ./app-text/dblatex/dblatex-0.3.11.ebuild
+2102012109 ./app-text/dblatex/dblatex-0.3.11-r1.ebuild
 2101061709 ./app-text/delta/delta-20060803-r1.ebuild
 2101061709 ./app-text/dictd/dictd-1.13.0-r1.ebuild
 2012311940 ./app-text/diction/diction-1.13.ebuild
@@ -4215,6 +4222,7 @@
 2010311239 ./app-text/libmwaw/libmwaw-9999.ebuild
 2011231309 ./app-text/libmwaw/libmwaw-0.3.17.ebuild
 2010181839 ./app-text/libnumbertext/libnumbertext-1.0.6.ebuild
+2102020109 ./app-text/libnumbertext/libnumbertext-1.0.7.ebuild
 1907310109 ./app-text/libodfgen/libodfgen-0.1.7.ebuild
 2101230339 ./app-text/libodfgen/libodfgen-0.1.8.ebuild
 2101230339 ./app-text/libodfgen/libodfgen-9999.ebuild
@@ -4301,7 +4309,8 @@
 2101061709 ./app-text/poppler/poppler-20.11.0.ebuild
 2101061709 ./app-text/poppler/poppler-20.12.1.ebuild
 2101061709 ./app-text/poppler/poppler-21.01.0.ebuild
-2101061709 ./app-text/poppler/poppler-9999.ebuild
+2102020439 ./app-text/poppler/poppler-21.02.0.ebuild
+2102020439 ./app-text/poppler/poppler-9999.ebuild
 2101061709 ./app-text/ps2eps/ps2eps-1.68.ebuild
 2101061709 ./app-text/ps2pkm/ps2pkm-1.8_p20200406.ebuild
 2002280339 ./app-text/psiconv/psiconv-0.8.3-r1.ebuild
@@ -5361,7 +5370,7 @@
 2003211239 ./dev-db/spatialite/spatialite-4.3.0a.ebuild
 1908210209 ./dev-db/sqlcipher/sqlcipher-4.0.1.ebuild
 2002151310 ./dev-db/sqlcipher/sqlcipher-3.4.2.ebuild
-2011231639 ./dev-db/sqlcl-bin/sqlcl-bin-20.3.0.274.1916.ebuild
+2102011639 ./dev-db/sqlcl-bin/sqlcl-bin-20.4.1.351.1718.ebuild
 2010101039 ./dev-db/sqldeveloper/sqldeveloper-20.2.0.175.1842.ebuild
 2101091409 ./dev-db/sqldeveloper/sqldeveloper-4.2.0.17.089.1709.ebuild
 2101062209 ./dev-db/sqlite/sqlite-3.33.0.ebuild
@@ -7549,7 +7558,7 @@
 1909290609 ./dev-libs/darts/darts-9999.ebuild
 1912312139 ./dev-libs/darts/darts-0.32h_pre20181117064816.ebuild
 2002162339 ./dev-libs/dbus-c++/dbus-c++-0.9.0-r3.ebuild
-2101240309 ./dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild
+2102011839 ./dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild
 2101062239 ./dev-libs/dbus-glib/dbus-glib-0.110.ebuild
 1907070939 ./dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.4.ebuild
 1902240439 ./dev-libs/dietlibc/dietlibc-0.34.ebuild
@@ -7621,12 +7630,13 @@
 2101310343 ./dev-libs/gom/gom-0.4.ebuild
 2010130739 ./dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r1.ebuild
 2010130739 ./dev-libs/gost-engine/gost-engine-9999.ebuild
-1910221039 ./dev-libs/granite/granite-5.2.5-r1.ebuild
+2102011639 ./dev-libs/granite/granite-5.2.5-r1.ebuild
+2102011639 ./dev-libs/granite/granite-5.5.0.ebuild
 2003191509 ./dev-libs/grantlee/grantlee-5.2.0.ebuild
 1705070118 ./dev-libs/gtx/gtx-0.2.2.ebuild
 2101062239 ./dev-libs/gumbo/gumbo-0.10.1.ebuild
 2012091239 ./dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719.ebuild
-2101240309 ./dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719-r1.ebuild
+2102011839 ./dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719-r1.ebuild
 2011260239 ./dev-libs/hiredis/hiredis-0.14.1.ebuild
 2012181739 ./dev-libs/hiredis/hiredis-1.0.0.ebuild
 2011142339 ./dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
@@ -7780,6 +7790,7 @@
 2101070439 ./dev-libs/libev/libev-4.33.ebuild
 2101310343 ./dev-libs/libevdev/libevdev-1.10.0.ebuild
 2101310343 ./dev-libs/libevdev/libevdev-9999.ebuild
+2102011909 ./dev-libs/libevdev/libevdev-1.11.0.ebuild
 2007051809 ./dev-libs/libevent/libevent-2.1.9999.ebuild
 2008142109 ./dev-libs/libevent/libevent-9999.ebuild
 2101062239 ./dev-libs/libevent/libevent-2.1.11.ebuild
@@ -7898,7 +7909,7 @@
 2101040209 ./dev-libs/libofx/libofx-0.10.0.ebuild
 2101260109 ./dev-libs/libofx/libofx-0.10.1.ebuild
 2101062239 ./dev-libs/liboil/liboil-0.3.17-r2.ebuild
-2101300009 ./dev-libs/liboil/liboil-0.3.17-r3.ebuild
+2102011839 ./dev-libs/liboil/liboil-0.3.17-r3.ebuild
 2101310343 ./dev-libs/liborcus/liborcus-0.15.4.ebuild
 2101310343 ./dev-libs/liborcus/liborcus-9999.ebuild
 2012311940 ./dev-libs/libotf/libotf-0.9.13.ebuild
@@ -8274,7 +8285,7 @@
 2012311940 ./dev-libs/ucl/ucl-1.03-r1.ebuild
 1902152239 ./dev-libs/ucommon/ucommon-7.0.0.ebuild
 1912110241 ./dev-libs/udis86/udis86-1.7-r2.ebuild
-2101241539 ./dev-libs/udis86/udis86-1.7.2-r1.ebuild
+2102011839 ./dev-libs/udis86/udis86-1.7.2-r1.ebuild
 2008080909 ./dev-libs/unibilium/unibilium-2.0.0.ebuild
 2009300339 ./dev-libs/unibilium/unibilium-2.1.0.ebuild
 2008152109 ./dev-libs/unittest++/unittest++-2.0.0.ebuild
@@ -8580,8 +8591,8 @@
 2101262039 ./dev-ml/dose3/dose3-5.0.1-r1.ebuild
 2101270939 ./dev-ml/dose3/dose3-5.0.1_p16.ebuild
 2003312109 ./dev-ml/dune/dune-2.1.0.ebuild
-2101262109 ./dev-ml/dune/dune-2.8.2.ebuild
 2101301939 ./dev-ml/dune/dune-2.7.1.ebuild
+2102020039 ./dev-ml/dune/dune-2.8.2.ebuild
 1704011524 ./dev-ml/easy-format/easy-format-1.2.0.ebuild
 1706091914 ./dev-ml/eliom/eliom-6.2.0.ebuild
 1706091914 ./dev-ml/eliom/eliom-9999.ebuild
@@ -8653,8 +8664,8 @@
 2010280709 ./dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild
 1912110241 ./dev-ml/ocaml-expect/ocaml-expect-0.0.5.ebuild
 2006241339 ./dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.2.ebuild
-2010171439 ./dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r2.ebuild
 2101270639 ./dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
+2102020739 ./dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r2.ebuild
 1709011418 ./dev-ml/ocaml-hashcons/ocaml-hashcons-1.3.ebuild
 1912110241 ./dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.8.0.ebuild
 1702282250 ./dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.0.0.ebuild
@@ -8670,6 +8681,7 @@
 2101250009 ./dev-ml/ocaml-sqlite3/ocaml-sqlite3-5.0.2.ebuild
 2010201309 ./dev-ml/ocaml-ssl/ocaml-ssl-0.5.3-r1.ebuild
 2010240409 ./dev-ml/ocaml-ssl/ocaml-ssl-0.5.9.ebuild
+2102012109 ./dev-ml/ocaml-ssl/ocaml-ssl-0.5.10.ebuild
 1912110241 ./dev-ml/ocaml-uri/ocaml-uri-1.9.4.ebuild
 2101242039 ./dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
 2101242039 ./dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
@@ -8854,7 +8866,7 @@
 2101140009 ./dev-ml/unidecode/unidecode-0.4.0.ebuild
 2101131109 ./dev-ml/uunf/uunf-13.0.0.ebuild
 2101270639 ./dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2.ebuild
-2101270639 ./dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2.ebuild
+2102020739 ./dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2.ebuild
 2101282339 ./dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild
 2101282339 ./dev-ml/core_bench/core_bench-0.14.0.ebuild
 2101282339 ./dev-ml/timezone/timezone-0.14.0.ebuild
@@ -10960,6 +10972,7 @@
 2006260109 ./dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.8.ebuild
 2006291839 ./dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.9.ebuild
 2012150539 ./dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild
+2102020439 ./dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.10.ebuild
 2012150539 ./dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild
 2012150539 ./dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild
 2012150539 ./dev-php/PEAR-Net_DNS/PEAR-Net_DNS-1.0.7-r1.ebuild
@@ -11035,6 +11048,7 @@
 2101072209 ./dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.12.ebuild
 2001312209 ./dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.5.4.ebuild
 2008270009 ./dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.5.6.ebuild
+2102020439 ./dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.5.8.ebuild
 2012150539 ./dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild
 2012150539 ./dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild
 2101072339 ./dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild
@@ -11046,26 +11060,21 @@
 2012150539 ./dev-php/YAML/YAML-1.0.6-r3.ebuild
 2008061739 ./dev-php/adodb/adodb-5.20.18.ebuild
 2012150539 ./dev-php/adodb/adodb-5.20.14.ebuild
+2102020109 ./dev-php/adodb/adodb-5.20.20.ebuild
 2012110039 ./dev-php/agavi/agavi-1.0.8.ebuild
 2011300409 ./dev-php/awl/awl-0.61.ebuild
 1908161739 ./dev-php/ca-bundle/ca-bundle-1.1.3.ebuild
 1702282250 ./dev-php/cli-prompt/cli-prompt-1.0.0.ebuild
 1812180409 ./dev-php/cli-prompt/cli-prompt-1.0.3.ebuild
-2002141839 ./dev-php/composer/composer-1.9.3.ebuild
-2003200109 ./dev-php/composer/composer-1.10.1.ebuild
-2004211439 ./dev-php/composer/composer-1.10.5.ebuild
-2005191309 ./dev-php/composer/composer-1.10.6.ebuild
-2006150239 ./dev-php/composer/composer-1.10.7.ebuild
-2006291839 ./dev-php/composer/composer-1.10.8.ebuild
-2007262138 ./dev-php/composer/composer-1.10.9.ebuild
-2008061739 ./dev-php/composer/composer-1.10.10.ebuild
-2009140239 ./dev-php/composer/composer-1.10.13.ebuild
 2010200039 ./dev-php/composer/composer-1.10.15.ebuild
+2102012009 ./dev-php/composer/composer-1.10.20.ebuild
+2102012239 ./dev-php/composer/composer-2.0.9.ebuild
 1707271806 ./dev-php/cphplib/cphplib-0.51-r1.ebuild
 2003261841 ./dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild
 2003261841 ./dev-php/doctrine-instantiator/doctrine-instantiator-1.3.0.ebuild
 2012150539 ./dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild
 2101072339 ./dev-php/doctrine-instantiator/doctrine-instantiator-1.3.1.ebuild
+2102020439 ./dev-php/doctrine-instantiator/doctrine-instantiator-1.4.0.ebuild
 1806072239 ./dev-php/doctrine/doctrine-2.6.1.ebuild
 1912021739 ./dev-php/doctrine/doctrine-2.6.4.ebuild
 2003261841 ./dev-php/fedora-autoloader/fedora-autoloader-1.0.0.ebuild
@@ -11082,6 +11091,7 @@
 1911180009 ./dev-php/json-schema/json-schema-5.2.9.ebuild
 2006150239 ./dev-php/json-schema/json-schema-5.2.10.ebuild
 2011151839 ./dev-php/jsonlint/jsonlint-1.8.2.ebuild
+2102020439 ./dev-php/jsonlint/jsonlint-1.8.3.ebuild
 2006041239 ./dev-php/libchart/libchart-1.3.ebuild
 1906071739 ./dev-php/libvirt-php/libvirt-php-0.5.4.ebuild
 2006150239 ./dev-php/libvirt-php/libvirt-php-0.5.5.ebuild
@@ -11108,11 +11118,8 @@
 2012102339 ./dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild
 1911290209 ./dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r2.ebuild
 1912052209 ./dev-php/pecl-http/pecl-http-3.2.1.ebuild
-1912130339 ./dev-php/pecl-http/pecl-http-3.2.3.ebuild
-2012102339 ./dev-php/pecl-http/pecl-http-3.2.3-r1.ebuild
-2012102339 ./dev-php/pecl-http/pecl-http-4.0.0_beta1.ebuild
-2101210609 ./dev-php/pecl-http/pecl-http-3.2.4.ebuild
-2101210609 ./dev-php/pecl-http/pecl-http-4.0.0.ebuild
+2102011909 ./dev-php/pecl-http/pecl-http-3.2.4.ebuild
+2102011909 ./dev-php/pecl-http/pecl-http-4.0.0.ebuild
 2008182209 ./dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild
 2101111809 ./dev-php/pecl-lzf/pecl-lzf-1.6.8-r1.ebuild
 2101260209 ./dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild
@@ -11140,6 +11147,7 @@
 2002212109 ./dev-php/pecl-stomp/pecl-stomp-2.0.2-r1.ebuild
 2101212039 ./dev-php/pecl-taint/pecl-taint-2.1.0.ebuild
 2012090109 ./dev-php/pecl-timezonedb/pecl-timezonedb-2020.4.ebuild
+2102020439 ./dev-php/pecl-timezonedb/pecl-timezonedb-2021.1.ebuild
 2012090109 ./dev-php/pecl-translit/pecl-translit-0.7.1.ebuild
 2005211939 ./dev-php/pecl-uploadprogress/pecl-uploadprogress-1.1.3-r1.ebuild
 2012090109 ./dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
@@ -11151,7 +11159,9 @@
 2011261639 ./dev-php/pecl-zmq/pecl-zmq-1.1.3-r3.ebuild
 2011261639 ./dev-php/pecl-zmq/pecl-zmq-9999.ebuild
 2101080039 ./dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild
+2102012009 ./dev-php/phar-io-manifest/phar-io-manifest-2.0.1.ebuild
 2101080039 ./dev-php/phar-io-version/phar-io-version-2.0.1.ebuild
+2102012009 ./dev-php/phar-io-version/phar-io-version-3.0.4.ebuild
 1702282250 ./dev-php/phar-utils/phar-utils-1.0.0.ebuild
 1809201609 ./dev-php/phar-utils/phar-utils-1.0.1.ebuild
 2003200109 ./dev-php/phar-utils/phar-utils-1.1.0.ebuild
@@ -11180,6 +11190,7 @@
 2012150539 ./dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild
 2012150539 ./dev-php/phpunit/phpunit-5.7.15-r3.ebuild
 2101072339 ./dev-php/phpunit/phpunit-8.5.11.ebuild
+2102012009 ./dev-php/phpunit/phpunit-8.5.14.ebuild
 1702282250 ./dev-php/psr-log/psr-log-1.0.2.ebuild
 1812230239 ./dev-php/psr-log/psr-log-1.1.0.ebuild
 1911180009 ./dev-php/psr-log/psr-log-1.1.2.ebuild
@@ -11208,6 +11219,7 @@
 2003200109 ./dev-php/semver/semver-1.5.1.ebuild
 2009140239 ./dev-php/semver/semver-1.7.0.ebuild
 2010200039 ./dev-php/semver/semver-1.7.1.ebuild
+2102012239 ./dev-php/semver/semver-3.2.4.ebuild
 1707101834 ./dev-php/simpletest/simpletest-1.1.7.ebuild
 2012150539 ./dev-php/smarty/smarty-3.1.33.ebuild
 2012170709 ./dev-php/smarty/smarty-3.1.36.ebuild
@@ -11272,6 +11284,9 @@
 2101072239 ./dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.2.ebuild
 2101072239 ./dev-php/zetacomponents-Base/zetacomponents-Base-1.9.1.ebuild
 2101072239 ./dev-php/zetacomponents-ConsoleTools/zetacomponents-ConsoleTools-1.7.2.ebuild
+2102012239 ./dev-php/reactphp-promise/reactphp-promise-2.8.0.ebuild
+2102011639 ./dev-php/scrypt/scrypt-1.4.2.ebuild
+2102011639 ./dev-php/scrypt/scrypt-9999.ebuild
 2101310343 ./dev-python/3to2/3to2-1.1.1-r1.ebuild
 2101310343 ./dev-python/APScheduler/APScheduler-3.6.3.ebuild
 2101310343 ./dev-python/Babel/Babel-2.8.1.ebuild
@@ -11584,6 +11599,9 @@
 2101310343 ./dev-python/django/django-3.0.11.ebuild
 2101310343 ./dev-python/django/django-3.1.4.ebuild
 2101310343 ./dev-python/django/django-3.1.5.ebuild
+2102012009 ./dev-python/django/django-2.2.18.ebuild
+2102012009 ./dev-python/django/django-3.0.12.ebuild
+2102012009 ./dev-python/django/django-3.1.6.ebuild
 2101310343 ./dev-python/django_polymorphic/django_polymorphic-3.0.0.ebuild
 2101302339 ./dev-python/djangorestframework/djangorestframework-3.12.2.ebuild
 2101310343 ./dev-python/dkimpy/dkimpy-1.0.5.ebuild
@@ -11741,8 +11759,7 @@
 2101310343 ./dev-python/gsd/gsd-1.5.3-r1.ebuild
 2101310343 ./dev-python/gsd/gsd-2.4.0.ebuild
 2101310343 ./dev-python/gst-python/gst-python-1.16.2.ebuild
-2101310343 ./dev-python/guessit/guessit-3.1.1.ebuild
-2101310343 ./dev-python/guessit/guessit-3.2.0.ebuild
+2102011839 ./dev-python/guessit/guessit-3.2.0.ebuild
 2101310343 ./dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
 2101230209 ./dev-python/h11/h11-0.12.0.ebuild
 2101310343 ./dev-python/h11/h11-0.11.0.ebuild
@@ -11857,8 +11874,7 @@
 2101310343 ./dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
 2101310343 ./dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
 2101310343 ./dev-python/jmespath/jmespath-0.10.0.ebuild
-2101310343 ./dev-python/joblib/joblib-0.17.0.ebuild
-2101310343 ./dev-python/joblib/joblib-1.0.0.ebuild
+2102011839 ./dev-python/joblib/joblib-1.0.0.ebuild
 2101271209 ./dev-python/josepy/josepy-1.6.0.ebuild
 2101310343 ./dev-python/josepy/josepy-1.4.0.ebuild
 2101310343 ./dev-python/josepy/josepy-1.5.0.ebuild
@@ -12440,8 +12456,7 @@
 2101310343 ./dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild
 2101310343 ./dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
 2101310343 ./dev-python/pytest-xdist/pytest-xdist-1.34.0-r1.ebuild
-2101310343 ./dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild
-2101310343 ./dev-python/pytest-xdist/pytest-xdist-2.2.0.ebuild
+2102011839 ./dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild
 2101310343 ./dev-python/pytest-xprocess/pytest-xprocess-0.17.0.ebuild
 2101260139 ./dev-python/pytest/pytest-6.2.2.ebuild
 2101310343 ./dev-python/pytest/pytest-4.6.11-r1.ebuild
@@ -12666,6 +12681,7 @@
 2101310343 ./dev-python/setuptools/setuptools-51.1.0.ebuild
 2101310343 ./dev-python/setuptools/setuptools-51.1.1.ebuild
 2101310343 ./dev-python/setuptools/setuptools-51.1.2.ebuild
+2102012009 ./dev-python/setuptools/setuptools-53.0.0.ebuild
 2101310343 ./dev-python/setuptools_scm/setuptools_scm-4.1.2-r1.ebuild
 2101310343 ./dev-python/setuptools_scm/setuptools_scm-5.0.0.ebuild
 2101310343 ./dev-python/setuptools_scm/setuptools_scm-5.0.1.ebuild
@@ -12753,6 +12769,7 @@
 2101310343 ./dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild
 2101310343 ./dev-python/sqlalchemy/sqlalchemy-1.3.21.ebuild
 2101310343 ./dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild
+2102020209 ./dev-python/sqlalchemy/sqlalchemy-1.3.23.ebuild
 2101310343 ./dev-python/sshtunnel/sshtunnel-0.3.1.ebuild
 2101310343 ./dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
 2101310343 ./dev-python/ssl-fetch/ssl-fetch-9999.ebuild
@@ -12863,9 +12880,9 @@
 2101310343 ./dev-python/urllib3/urllib3-1.25.11.ebuild
 2101310343 ./dev-python/urllib3/urllib3-1.26.2-r1.ebuild
 2101310343 ./dev-python/urllib3/urllib3-1.26.2-r2.ebuild
-2101310343 ./dev-python/urllib3/urllib3-1.26.2-r3.ebuild
 2101310343 ./dev-python/urllib3/urllib3-1.26.2.ebuild
 2101310343 ./dev-python/urllib3/urllib3-1.26.3.ebuild
+2102011839 ./dev-python/urllib3/urllib3-1.26.2-r3.ebuild
 2101310343 ./dev-python/urwid/urwid-2.1.1.ebuild
 2101310343 ./dev-python/urwidtrees/urwidtrees-1.0.3.ebuild
 2101310343 ./dev-python/utidylib/utidylib-0.6-r1.ebuild
@@ -12883,6 +12900,7 @@
 2101310343 ./dev-python/virtualenv/virtualenv-20.3.1.ebuild
 2101310343 ./dev-python/virtualenv/virtualenv-20.4.0.ebuild
 2101312139 ./dev-python/virtualenv/virtualenv-20.4.1.ebuild
+2102012009 ./dev-python/virtualenv/virtualenv-20.4.2.ebuild
 2101310343 ./dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r1.ebuild
 2101310343 ./dev-python/visitor/visitor-0.1.3-r1.ebuild
 2101310343 ./dev-python/vobject/vobject-0.9.6.1-r2.ebuild
@@ -14802,6 +14820,7 @@
 2101062139 ./dev-ruby/i18n/i18n-1.8.5.ebuild
 2101062139 ./dev-ruby/i18n/i18n-1.8.6.ebuild
 2101071109 ./dev-ruby/i18n/i18n-1.8.7.ebuild
+2102020909 ./dev-ruby/i18n/i18n-1.8.8.ebuild
 2004041009 ./dev-ruby/ice_nine/ice_nine-0.11.2.ebuild
 2004011009 ./dev-ruby/idn-ruby/idn-ruby-0.1.0.ebuild
 2007200539 ./dev-ruby/image_processing/image_processing-1.10.3.ebuild
@@ -14818,6 +14837,7 @@
 2009130809 ./dev-ruby/jbuilder/jbuilder-2.10.0.ebuild
 2009190909 ./dev-ruby/jbuilder/jbuilder-2.10.1.ebuild
 2101231139 ./dev-ruby/jbuilder/jbuilder-2.11.0.ebuild
+2102020909 ./dev-ruby/jbuilder/jbuilder-2.11.2.ebuild
 2010010339 ./dev-ruby/jmespath/jmespath-1.4.0.ebuild
 2005090909 ./dev-ruby/jquery-rails/jquery-rails-4.4.0.ebuild
 2008161939 ./dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r1.ebuild
@@ -14873,6 +14893,7 @@
 2101062139 ./dev-ruby/maxitest/maxitest-3.6.0.ebuild
 2008091309 ./dev-ruby/mecab-ruby/mecab-ruby-0.996-r1.ebuild
 2101062139 ./dev-ruby/mechanize/mechanize-2.7.6.ebuild
+2102020909 ./dev-ruby/mechanize/mechanize-2.7.7.ebuild
 2101161039 ./dev-ruby/memoist/memoist-0.16.2.ebuild
 2002151109 ./dev-ruby/memoizable/memoizable-0.4.2.ebuild
 2008091309 ./dev-ruby/memoize/memoize-1.3.1-r1.ebuild
@@ -14939,7 +14960,8 @@
 2101101109 ./dev-ruby/necromancer/necromancer-0.7.0.ebuild
 2101062139 ./dev-ruby/nenv/nenv-0.3.0.ebuild
 2005311139 ./dev-ruby/neovim-ruby-client/neovim-ruby-client-0.8.1-r1.ebuild
-2101062139 ./dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild
+2102020909 ./dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1-r1.ebuild
+2102020909 ./dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild
 2101062139 ./dev-ruby/net-http-persistent/net-http-persistent-3.0.0.ebuild
 2101062139 ./dev-ruby/net-http-persistent/net-http-persistent-3.1.0.ebuild
 2101062139 ./dev-ruby/net-http-persistent/net-http-persistent-4.0.0.ebuild
@@ -15083,6 +15105,7 @@
 2101062139 ./dev-ruby/rake/rake-13.0.0.ebuild
 2101062139 ./dev-ruby/rake/rake-13.0.1.ebuild
 2101062139 ./dev-ruby/rake/rake-13.0.3.ebuild
+2102020909 ./dev-ruby/rake/rake-13.0.3-r1.ebuild
 1901272239 ./dev-ruby/rash/rash-0.4.0-r2.ebuild
 1909140909 ./dev-ruby/rash_alt/rash_alt-0.4.8.ebuild
 2012311209 ./dev-ruby/rash_alt/rash_alt-0.4.9.ebuild
@@ -15946,8 +15969,7 @@
 2101310343 ./dev-util/catfish/catfish-4.15.0.ebuild
 2101310343 ./dev-util/catkin/catkin-0.8.9.ebuild
 2101310343 ./dev-util/catkin/catkin-9999.ebuild
-2010221639 ./dev-util/cbindgen/cbindgen-0.15.0.ebuild
-2101221809 ./dev-util/cbindgen/cbindgen-0.16.0.ebuild
+2102011809 ./dev-util/cbindgen/cbindgen-0.16.0.ebuild
 2012311940 ./dev-util/ccache/ccache-3.7.12.ebuild
 2101070439 ./dev-util/ccache/ccache-4.1.ebuild
 2010070209 ./dev-util/cccc/cccc-3.1.5-r1.ebuild
@@ -15980,9 +16002,9 @@
 1804120208 ./dev-util/cmake-fedora/cmake-fedora-2.7.1.ebuild
 2101070210 ./dev-util/cmake/cmake-3.13.5.ebuild
 2101070210 ./dev-util/cmake/cmake-3.17.4-r1.ebuild
-2101232009 ./dev-util/cmake/cmake-3.18.5.ebuild
 2101282239 ./dev-util/cmake/cmake-3.19.3.ebuild
 2101290309 ./dev-util/cmake/cmake-3.19.4.ebuild
+2102011839 ./dev-util/cmake/cmake-3.18.5.ebuild
 2004032241 ./dev-util/cmocka/cmocka-1.1.5.ebuild
 2004080939 ./dev-util/codeblocks/codeblocks-9999.ebuild
 2007061039 ./dev-util/codeblocks/codeblocks-20.03-r1.ebuild
@@ -16225,7 +16247,7 @@
 2012291709 ./dev-util/lttng-tools/lttng-tools-2.12.0.ebuild
 2012301509 ./dev-util/lttng-ust/lttng-ust-2.11.0.ebuild
 2101050009 ./dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
-2101301309 ./dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
+2102011639 ./dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
 2007311939 ./dev-util/lxqt-build-tools/lxqt-build-tools-0.7.0.ebuild
 2101240209 ./dev-util/lxqt-build-tools/lxqt-build-tools-0.8.0.ebuild
 1712280139 ./dev-util/makeheaders/makeheaders-0_p4.ebuild
@@ -17855,7 +17877,7 @@
 2012160540 ./gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild
 2101251809 ./gui-libs/neatvnc/neatvnc-0.4.0.ebuild
 2101251809 ./gui-libs/neatvnc/neatvnc-9999.ebuild
-2102010439 ./gui-libs/display-manager-init/display-manager-init-1.0.ebuild
+2102020209 ./gui-libs/display-manager-init/display-manager-init-1.0.ebuild
 2101250209 ./gui-wm/sway/sway-1.5.1-r1.ebuild
 2101250209 ./gui-wm/sway/sway-9999.ebuild
 2011140009 ./gui-wm/wayfire/wayfire-0.6.0.ebuild
@@ -18495,7 +18517,7 @@
 2101091339 ./kde-frameworks/kquickcharts/kquickcharts-5.78.0.ebuild
 2101111109 ./kde-frameworks/kquickcharts/kquickcharts-5.77.0.ebuild
 2101091339 ./kde-frameworks/kdav/kdav-5.78.0.ebuild
-2101111109 ./kde-frameworks/kdav/kdav-5.77.0-r1.ebuild
+2102011939 ./kde-frameworks/kdav/kdav-5.77.0-r1.ebuild
 2003020109 ./kde-misc/basket/basket-2.49b.ebuild
 2005162209 ./kde-misc/colord-kde/colord-kde-0.5.0-r2.ebuild
 2011252009 ./kde-misc/kdeconnect/kdeconnect-20.08.3.ebuild
@@ -19103,7 +19125,7 @@
 2004261339 ./media-gfx/album/album-4.13-r2.ebuild
 2004261339 ./media-gfx/album/album-4.15-r1.ebuild
 2011090239 ./media-gfx/alembic/alembic-1.7.12.ebuild
-2011251109 ./media-gfx/alembic/alembic-1.7.16.ebuild
+2102011639 ./media-gfx/alembic/alembic-1.7.16.ebuild
 1708180709 ./media-gfx/apng2gif/apng2gif-1.8.ebuild
 1906051109 ./media-gfx/apngasm/apngasm-2.91.ebuild
 1708180721 ./media-gfx/apngdis/apngdis-2.9.ebuild
@@ -19243,11 +19265,11 @@
 2004032241 ./media-gfx/icon-slicer/icon-slicer-0.3.ebuild
 2007231139 ./media-gfx/icoutils/icoutils-0.32.3.ebuild
 2005172009 ./media-gfx/igal/igal-2.0-r1.ebuild
-2101231839 ./media-gfx/imagemagick/imagemagick-9999.ebuild
-2101271839 ./media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild
-2101271839 ./media-gfx/imagemagick/imagemagick-6.9.11.60.ebuild
-2101271839 ./media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild
-2101271839 ./media-gfx/imagemagick/imagemagick-7.0.10.60.ebuild
+2102011809 ./media-gfx/imagemagick/imagemagick-6.9.11.60.ebuild
+2102011809 ./media-gfx/imagemagick/imagemagick-6.9.11.61.ebuild
+2102011809 ./media-gfx/imagemagick/imagemagick-7.0.10.60.ebuild
+2102011809 ./media-gfx/imagemagick/imagemagick-7.0.10.61.ebuild
+2102011809 ./media-gfx/imagemagick/imagemagick-9999.ebuild
 2012141139 ./media-gfx/imageworsener/imageworsener-1.3.3.ebuild
 2101281009 ./media-gfx/img2pdf/img2pdf-0.4.0.ebuild
 2101310343 ./media-gfx/img2pdf/img2pdf-0.3.6.ebuild
@@ -19335,6 +19357,7 @@
 2007210509 ./media-gfx/plantuml/plantuml-1.2020.0.ebuild
 1702282250 ./media-gfx/png2ico/png2ico-2002.12.08.ebuild
 1810271909 ./media-gfx/pngcheck/pngcheck-2.3.0.ebuild
+2102020139 ./media-gfx/pngcheck/pngcheck-3.0.2.ebuild
 2101061739 ./media-gfx/pngcrush/pngcrush-1.8.13.ebuild
 1702282250 ./media-gfx/pngnq/pngnq-1.1.ebuild
 1911201439 ./media-gfx/pngquant/pngquant-2.12.3.ebuild
@@ -19513,7 +19536,7 @@
 2101310343 ./media-libs/ganv/ganv-1.6.0-r1.ebuild
 2101310343 ./media-libs/ganv/ganv-1.8.0.ebuild
 2012311940 ./media-libs/gavl/gavl-1.4.0-r1.ebuild
-2101240039 ./media-libs/gavl/gavl-1.4.0-r2.ebuild
+2102011839 ./media-libs/gavl/gavl-1.4.0-r2.ebuild
 2101262039 ./media-libs/gd/gd-2.3.0.ebuild
 2101310039 ./media-libs/gd/gd-2.3.1.ebuild
 2101310343 ./media-libs/gegl/gegl-0.4.24.ebuild
@@ -19615,9 +19638,8 @@
 2101191409 ./media-libs/libaom/libaom-2.0.1.ebuild
 2101061739 ./media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
 2101061739 ./media-libs/libass/libass-0.15.0.ebuild
-1905052209 ./media-libs/libbdplus/libbdplus-0.1.2.ebuild
 2101240309 ./media-libs/libbdplus/libbdplus-9999.ebuild
-2101301739 ./media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
+2102011639 ./media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
 1910111911 ./media-libs/libbluray/libbluray-9999.ebuild
 2101010639 ./media-libs/libbluray/libbluray-1.2.1.ebuild
 2101070439 ./media-libs/libbluray/libbluray-1.2.0.ebuild
@@ -19638,8 +19660,8 @@
 2101061739 ./media-libs/libdca/libdca-0.0.7.ebuild
 2004261239 ./media-libs/libde265/libde265-1.0.3.ebuild
 2011121839 ./media-libs/libde265/libde265-1.0.5.ebuild
-2012291709 ./media-libs/libde265/libde265-1.0.8.ebuild
 2012291709 ./media-libs/libde265/libde265-9999.ebuild
+2102011639 ./media-libs/libde265/libde265-1.0.8.ebuild
 2012311940 ./media-libs/libdiscid/libdiscid-0.6.2.ebuild
 2101312209 ./media-libs/libdmtx/libdmtx-0.7.5.ebuild
 2101061739 ./media-libs/libdv/libdv-1.0.0-r4.ebuild
@@ -19664,7 +19686,7 @@
 2101182009 ./media-libs/libexif/libexif-0.6.22_p20201105.ebuild
 2004261339 ./media-libs/libextractor/libextractor-1.9-r1.ebuild
 2012311940 ./media-libs/libfame/libfame-0.9.1-r2.ebuild
-2101300009 ./media-libs/libfame/libfame-0.9.1-r3.ebuild
+2102011839 ./media-libs/libfame/libfame-0.9.1-r3.ebuild
 2101310343 ./media-libs/libffado/libffado-2.4.4-r1.ebuild
 2011142339 ./media-libs/libfishsound/libfishsound-1.0.0.ebuild
 2004032241 ./media-libs/libfpx/libfpx-1.3.1_p10.ebuild
@@ -19692,11 +19714,11 @@
 1907140209 ./media-libs/libicns/libicns-0.8.1-r1.ebuild
 2101061739 ./media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
 2004032241 ./media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild
-2101300009 ./media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
+2102011839 ./media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
 2002222009 ./media-libs/libifp/libifp-1.0.0.2-r1.ebuild
 1906162009 ./media-libs/libilbc/libilbc-2.0.2.ebuild
-2101010609 ./media-libs/libilbc/libilbc-3.0.4.ebuild
 2101010609 ./media-libs/libilbc/libilbc-9999.ebuild
+2102011639 ./media-libs/libilbc/libilbc-3.0.4.ebuild
 2009030009 ./media-libs/libinsane/libinsane-1.0.7.ebuild
 2010252109 ./media-libs/libinsane/libinsane-1.0.8.ebuild
 2101021409 ./media-libs/libinsane/libinsane-1.0.9.ebuild
@@ -19724,21 +19746,21 @@
 2005040939 ./media-libs/libmetalink/libmetalink-0.1.3-r1.ebuild
 2101070109 ./media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
 2012311940 ./media-libs/libmms/libmms-0.6.4.ebuild
-2101300009 ./media-libs/libmms/libmms-0.6.4-r1.ebuild
+2102011839 ./media-libs/libmms/libmms-0.6.4-r1.ebuild
 2101061739 ./media-libs/libmng/libmng-2.0.3.ebuild
 2101061739 ./media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
-2101300009 ./media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild
+2102011839 ./media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild
 2102010809 ./media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
 2101061739 ./media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild
 2002231739 ./media-libs/libmpd/libmpd-11.8.17-r1.ebuild
 2010131239 ./media-libs/libmpdclient/libmpdclient-2.19.ebuild
 2012311940 ./media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
-2102011139 ./media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
+2102020739 ./media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
 2012030209 ./media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
 2011142339 ./media-libs/libmpris2client/libmpris2client-0.1.0-r1.ebuild
 1910111911 ./media-libs/libmtp/libmtp-9999.ebuild
-2101010609 ./media-libs/libmtp/libmtp-1.1.18.ebuild
 2101070439 ./media-libs/libmtp/libmtp-1.1.17.ebuild
+2102011639 ./media-libs/libmtp/libmtp-1.1.18.ebuild
 1912311739 ./media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
 2012072209 ./media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild
 2101310343 ./media-libs/libmypaint/libmypaint-1.6.1.ebuild
@@ -19752,8 +19774,8 @@
 2101061739 ./media-libs/libogg/libogg-1.3.4.ebuild
 2012311940 ./media-libs/liboggz/liboggz-1.1.1.ebuild
 2002112051 ./media-libs/libopenglrecorder/libopenglrecorder-0.1.0.ebuild
-1912110241 ./media-libs/libopenraw/libopenraw-0.1.3.ebuild
 2012311940 ./media-libs/libopenraw/libopenraw-0.1.2.ebuild
+2102020739 ./media-libs/libopenraw/libopenraw-0.1.3.ebuild
 1912312039 ./media-libs/libopenshot-audio/libopenshot-audio-0.1.9_pre20190502.ebuild
 2101211109 ./media-libs/libopenshot-audio/libopenshot-audio-0.2.0.ebuild
 2101310343 ./media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
@@ -19859,12 +19881,12 @@
 2010072209 ./media-libs/nv-codec-headers/nv-codec-headers-9.1.23.1.ebuild
 2010141139 ./media-libs/nv-codec-headers/nv-codec-headers-10.0.26.1.ebuild
 2009040309 ./media-libs/openal/openal-1.20.1.ebuild
-2101010339 ./media-libs/openal/openal-1.21.0.ebuild
+2102011639 ./media-libs/openal/openal-1.21.0.ebuild
 2002162339 ./media-libs/opencollada/opencollada-1.6.63-r1.ebuild
 2011090239 ./media-libs/opencollada/opencollada-1.6.68.ebuild
 2101310343 ./media-libs/opencolorio/opencolorio-1.1.1.ebuild
 2101061739 ./media-libs/opencore-amr/opencore-amr-0.1.3-r1.ebuild
-2101300009 ./media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild
+2102011839 ./media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild
 2002140109 ./media-libs/openctm/openctm-1.0.3.ebuild
 2101091409 ./media-libs/openctm/openctm-1.0.3-r1.ebuild
 2101310343 ./media-libs/opencv/opencv-4.1.2-r3.ebuild
@@ -20270,9 +20292,8 @@
 2010082309 ./media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.2.ebuild
 2010082309 ./media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
 2010301709 ./media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-7.0.0.ebuild
-2007292139 ./media-plugins/kodi-pvr-demo/kodi-pvr-demo-6.0.1.ebuild
 2007292139 ./media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild
-2010301709 ./media-plugins/kodi-pvr-demo/kodi-pvr-demo-7.0.0.ebuild
+2102011909 ./media-plugins/kodi-pvr-demo/kodi-pvr-demo-7.1.0.ebuild
 2009170109 ./media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-8.0.0.ebuild
 2010301709 ./media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9.0.0.ebuild
 2011101839 ./media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9.0.1.ebuild
@@ -20898,7 +20919,7 @@
 2006062139 ./media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild
 2006062139 ./media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
 2012142009 ./media-sound/pulseaudio/pulseaudio-13.0.ebuild
-2102011139 ./media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
+2102020739 ./media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
 2005261909 ./media-sound/pulseeffects/pulseeffects-4.7.2-r1.ebuild
 2012220109 ./media-sound/pulseeffects/pulseeffects-4.8.4.ebuild
 2101270139 ./media-sound/pulseeffects/pulseeffects-5.0.0.ebuild
@@ -21064,10 +21085,9 @@
 2002151310 ./media-tv/gtk-v4l/gtk-v4l-0.4.ebuild
 1912131639 ./media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
 1806021308 ./media-tv/ivtvplayer/ivtvplayer-0.1.3-r2.ebuild
-2101310343 ./media-tv/kodi/kodi-19.0_beta2_p20210112.ebuild
-2101310343 ./media-tv/kodi/kodi-19.0_rc1.ebuild
-2101310343 ./media-tv/kodi/kodi-19.9999.ebuild
-2101310343 ./media-tv/kodi/kodi-9999.ebuild
+2102020009 ./media-tv/kodi/kodi-19.0_rc1-r2.ebuild
+2102020009 ./media-tv/kodi/kodi-19.9999.ebuild
+2102020009 ./media-tv/kodi/kodi-9999.ebuild
 2011010639 ./media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
 1702282250 ./media-tv/mythtv-status/mythtv-status-0.10.4.ebuild
 2101310343 ./media-tv/mythtv/mythtv-31.0-r5.ebuild
@@ -21143,7 +21163,7 @@
 2101310343 ./media-video/gaupol/gaupol-1.8-r2.ebuild
 2101310343 ./media-video/gaupol/gaupol-1.9.ebuild
 1708301113 ./media-video/gnome-video-effects/gnome-video-effects-0.4.3.ebuild
-1702282250 ./media-video/google2srt/google2srt-0.5.6-r1.ebuild
+2102011639 ./media-video/google2srt/google2srt-0.5.6-r1.ebuild
 2101181809 ./media-video/gpac/gpac-9999.ebuild
 2101200409 ./media-video/gpac/gpac-1.0.1.ebuild
 2005212308 ./media-video/guvcview/guvcview-2.0.6-r1.ebuild
@@ -21298,8 +21318,8 @@
 2007140139 ./media-video/rav1e/rav1e-9999.ebuild
 2010091209 ./media-video/rav1e/rav1e-0.3.3.ebuild
 2012202009 ./media-video/rav1e/rav1e-0.3.4.ebuild
-2101010309 ./media-video/rav1e/rav1e-0.3.5.ebuild
 2101132109 ./media-video/rav1e/rav1e-0.4.0.ebuild
+2102011639 ./media-video/rav1e/rav1e-0.3.5.ebuild
 1912021109 ./media-video/celluloid/celluloid-0.16.ebuild
 2004171539 ./media-video/celluloid/celluloid-0.19.ebuild
 2004181239 ./media-video/celluloid/celluloid-0.18.ebuild
@@ -21409,7 +21429,7 @@
 1702282250 ./net-analyzer/ftester/ftester-1.0.ebuild
 2002112051 ./net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild
 2002112051 ./net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
-1702282250 ./net-analyzer/gensink/gensink-4.1-r2.ebuild
+2102011639 ./net-analyzer/gensink/gensink-4.1-r2.ebuild
 2005062039 ./net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild
 2011201539 ./net-analyzer/goaccess/goaccess-1.4.2.ebuild
 2011201539 ./net-analyzer/goaccess/goaccess-9999.ebuild
@@ -21728,11 +21748,11 @@
 2101281509 ./net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild
 2101281509 ./net-analyzer/zabbix/zabbix-4.0.28.ebuild
 2101281509 ./net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild
-2101281509 ./net-analyzer/zabbix/zabbix-5.0.7.ebuild
 2101281509 ./net-analyzer/zabbix/zabbix-5.0.8.ebuild
 2101281509 ./net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild
-2101281509 ./net-analyzer/zabbix/zabbix-5.2.3.ebuild
 2101281509 ./net-analyzer/zabbix/zabbix-5.2.4.ebuild
+2102011639 ./net-analyzer/zabbix/zabbix-5.0.7.ebuild
+2102011639 ./net-analyzer/zabbix/zabbix-5.2.3.ebuild
 2010021709 ./net-analyzer/zmap/zmap-9999.ebuild
 2010071039 ./net-analyzer/zmap/zmap-2.1.1-r2.ebuild
 1702282250 ./net-analyzer/zniper/zniper-1.0-r1.ebuild
@@ -21872,7 +21892,6 @@
 2012160039 ./net-dns/pdns/pdns-4.3.1.ebuild
 2012182339 ./net-dns/pdns/pdns-4.4.0.ebuild
 2101230739 ./net-dns/pdns/pdns-4.4.0-r100.ebuild
-2004032241 ./net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild
 2101182339 ./net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild
 2012311940 ./net-dns/rbldnsd/rbldnsd-0.998b-r2.ebuild
 2003251209 ./net-dns/resolv_wrapper/resolv_wrapper-1.1.6.ebuild
@@ -21957,7 +21976,7 @@
 2007201609 ./net-fs/davfs2/davfs2-1.5.4.ebuild
 2007201609 ./net-fs/davfs2/davfs2-1.5.5.ebuild
 2009300139 ./net-fs/davfs2/davfs2-1.5.6-r1.ebuild
-2101301739 ./net-fs/davfs2/davfs2-1.6.0.ebuild
+2102011639 ./net-fs/davfs2/davfs2-1.6.0.ebuild
 2010061739 ./net-fs/docker-volume-netshare/docker-volume-netshare-0.35.ebuild
 2012140439 ./net-fs/libnfs/libnfs-9999.ebuild
 2012311940 ./net-fs/libnfs/libnfs-4.0.0.ebuild
@@ -21987,8 +22006,8 @@
 2012240739 ./net-fs/sshfs/sshfs-3.7.1.ebuild
 2012311940 ./net-fs/sshfs/sshfs-3.7.0.ebuild
 2012181339 ./net-fs/wdfs/wdfs-1.4.2-r2.ebuild
-2101221539 ./net-ftp/atftp/atftp-0.7.2-r3.ebuild
 2101251539 ./net-ftp/atftp/atftp-0.7.2-r2.ebuild
+2102020139 ./net-ftp/atftp/atftp-0.7.2-r3.ebuild
 1910111911 ./net-ftp/cmdftp/cmdftp-0.9.8.ebuild
 2012220839 ./net-ftp/filezilla/filezilla-3.51.0.ebuild
 2101081609 ./net-ftp/filezilla/filezilla-3.52.0.5.ebuild
@@ -22099,7 +22118,7 @@
 2009071209 ./net-im/slack/slack-4.4.2.ebuild
 2009071209 ./net-im/slack/slack-4.4.3.ebuild
 2012101039 ./net-im/slack/slack-4.11.3.ebuild
-2012261809 ./net-im/element-desktop-bin/element-desktop-bin-1.7.16.ebuild
+2102011539 ./net-im/element-desktop-bin/element-desktop-bin-1.7.18.ebuild
 2010080109 ./net-im/prosody-modules/prosody-modules-9999.ebuild
 2101060139 ./net-im/prosody-modules/prosody-modules-0_pre20210105.ebuild
 2101140239 ./net-im/neochat/neochat-1.0.1.ebuild
@@ -22271,9 +22290,9 @@
 1908050509 ./net-libs/libgfbgraph/libgfbgraph-0.2.3-r1.ebuild
 1708261307 ./net-libs/libgrss/libgrss-0.5.0-r1.ebuild
 2012231444 ./net-libs/libgrss/libgrss-0.7.0.ebuild
-2102010909 ./net-libs/libgsasl/libgsasl-1.10.0.ebuild
 2102010909 ./net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
 2102010909 ./net-libs/libgsasl/libgsasl-1.8.1.ebuild
+2102020139 ./net-libs/libgsasl/libgsasl-1.10.0.ebuild
 2012311940 ./net-libs/libgssglue/libgssglue-0.4-r1.ebuild
 2006060309 ./net-libs/libhackrf/libhackrf-2018.01.1.ebuild
 2006060309 ./net-libs/libhackrf/libhackrf-9999.ebuild
@@ -22322,7 +22341,7 @@
 2012311940 ./net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0.ebuild
 1805061738 ./net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
 2012311940 ./net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0.ebuild
-1805061738 ./net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild
+2102011639 ./net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild
 2006081239 ./net-libs/libnetfilter_queue/libnetfilter_queue-1.0.4.ebuild
 2006141309 ./net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild
 2012311940 ./net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild
@@ -22352,10 +22371,8 @@
 2101061839 ./net-libs/libpcap/libpcap-1.9.1-r3.ebuild
 2011291139 ./net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild
 2007201539 ./net-libs/libpri/libpri-1.6.0.ebuild
-1904151309 ./net-libs/libprotoident/libprotoident-2.0.13.ebuild
 1904151309 ./net-libs/libprotoident/libprotoident-9999.ebuild
 1911201539 ./net-libs/libprotoident/libprotoident-2.0.14_p1.ebuild
-2002151310 ./net-libs/libprotoident/libprotoident-2.0.12.ebuild
 2101061839 ./net-libs/libproxy/libproxy-0.4.16-r1.ebuild
 2101061839 ./net-libs/libproxy/libproxy-0.4.17.ebuild
 2101310343 ./net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -22375,7 +22392,7 @@
 1907151840 ./net-libs/libsrsirc/libsrsirc-0.0.14-r1.ebuild
 2101061839 ./net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
 2101061839 ./net-libs/libsrtp/libsrtp-2.2.0.ebuild
-2102011139 ./net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
+2102011639 ./net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
 2005040140 ./net-libs/libssh/libssh-9999.ebuild
 2012311940 ./net-libs/libssh/libssh-0.9.5.ebuild
 2006081209 ./net-libs/libssh2/libssh2-9999.ebuild
@@ -22431,7 +22448,7 @@
 2101061839 ./net-libs/neon/neon-0.31.0.ebuild
 2101061839 ./net-libs/neon/neon-0.31.1.ebuild
 2101201239 ./net-libs/neon/neon-0.31.2.ebuild
-2012311940 ./net-libs/net6/net6-1.3.14-r2.ebuild
+2102011639 ./net-libs/net6/net6-1.3.14-r2.ebuild
 1702282250 ./net-libs/netwib/netwib-5.39.0.ebuild
 2009011309 ./net-libs/nghttp2/nghttp2-1.41.0.ebuild
 2012201509 ./net-libs/nghttp2/nghttp2-1.42.0.ebuild
@@ -22459,7 +22476,8 @@
 2012300009 ./net-libs/pjproject/pjproject-2.9-r2.ebuild
 2007310009 ./net-libs/quiche/quiche-0.5.1.ebuild
 2010261739 ./net-libs/quiche/quiche-0.6.0.ebuild
-2010261739 ./net-libs/quiche/quiche-9999.ebuild
+2102011909 ./net-libs/quiche/quiche-0.7.0.ebuild
+2102011909 ./net-libs/quiche/quiche-9999.ebuild
 2003110009 ./net-libs/qxmpp/qxmpp-9999.ebuild
 2006040939 ./net-libs/qxmpp/qxmpp-1.2.0.ebuild
 2012311940 ./net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
@@ -22601,7 +22619,7 @@
 2002230040 ./net-mail/mpack/mpack-1.6-r4.ebuild
 1907061239 ./net-mail/mpop/mpop-1.4.4.ebuild
 2002060709 ./net-mail/mpop/mpop-1.4.7.ebuild
-1704041838 ./net-mail/mswatch/mswatch-1.2.0-r1.ebuild
+2102011639 ./net-mail/mswatch/mswatch-1.2.0-r1.ebuild
 2012011309 ./net-mail/mu/mu-1.4.13.ebuild
 2101240339 ./net-mail/mu/mu-1.4.15.ebuild
 2005120939 ./net-mail/muchsync/muchsync-5.ebuild
@@ -22778,7 +22796,7 @@
 2101310343 ./net-misc/dropbox-cli/dropbox-cli-2020.03.04.ebuild
 2012201909 ./net-misc/dropbox/dropbox-112.4.321.ebuild
 2101171809 ./net-misc/dropbox/dropbox-113.4.507.ebuild
-2101271809 ./net-misc/dropbox/dropbox-114.4.426.ebuild
+2102011609 ./net-misc/dropbox/dropbox-114.4.426.ebuild
 2101310343 ./net-misc/econnman/econnman-1.1-r1.ebuild
 2009050409 ./net-misc/efax/efax-0.9a_p19_p1.ebuild
 2012310209 ./net-misc/electron-cash/electron-cash-4.2.3.ebuild
@@ -22825,9 +22843,9 @@
 2005251909 ./net-misc/grive/grive-0.5.1.ebuild
 2009201739 ./net-misc/grive/grive-0.5.1-r1.ebuild
 2009271739 ./net-misc/grive/grive-0.5.2_pre20200205.ebuild
-2102010909 ./net-misc/gsasl/gsasl-1.10.0.ebuild
 2102010909 ./net-misc/gsasl/gsasl-1.8.0-r1.ebuild
 2102010909 ./net-misc/gsasl/gsasl-1.8.1.ebuild
+2102011639 ./net-misc/gsasl/gsasl-1.10.0.ebuild
 2101310343 ./net-misc/gsutil/gsutil-4.50.ebuild
 2007201609 ./net-misc/gupnp-tools/gupnp-tools-0.10.0.ebuild
 1707171451 ./net-misc/gvrpcd/gvrpcd-1.3.ebuild
@@ -22863,11 +22881,11 @@
 1801012010 ./net-misc/ipsvd/ipsvd-1.0.0-r2.ebuild
 2012272109 ./net-misc/iputils/iputils-20190709-r1.ebuild
 2012282109 ./net-misc/iputils/iputils-99999999.ebuild
-2101282109 ./net-misc/iputils/iputils-20200821-r2.ebuild
+2102011839 ./net-misc/iputils/iputils-20200821-r2.ebuild
 1912172109 ./net-misc/ipv6calc/ipv6calc-2.1.1.ebuild
 1912241139 ./net-misc/ipv6calc/ipv6calc-2.1.0.ebuild
-2006160009 ./net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
 2012311940 ./net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
+2102012109 ./net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
 1902201609 ./net-misc/jlj/jlj-2.12-r1.ebuild
 1911100109 ./net-misc/jrdesktop/jrdesktop-0.3.1.0.ebuild
 2012311940 ./net-misc/jwhois/jwhois-4.0-r1.ebuild
@@ -23123,11 +23141,12 @@
 2101061839 ./net-misc/stunnel/stunnel-5.56-r1.ebuild
 1904290109 ./net-misc/stuntman/stuntman-1.2.15.ebuild
 2002112051 ./net-misc/suite3270/suite3270-3.6_p8.ebuild
-2101312209 ./net-misc/suite3270/suite3270-4.0_p13.ebuild
+2102020739 ./net-misc/suite3270/suite3270-4.0_p13.ebuild
 1805290208 ./net-misc/taptap/taptap-1.0.ebuild
 2009150309 ./net-misc/taylor-uucp/taylor-uucp-1.07-r4.ebuild
 2009071139 ./net-misc/tcpsound/tcpsound-0.3.1-r1.ebuild
 2102010339 ./net-misc/teamviewer/teamviewer-15.14.3.ebuild
+2102011809 ./net-misc/teamviewer/teamviewer-15.14.5.ebuild
 2012311940 ./net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
 2101061839 ./net-misc/throttle/throttle-1.2-r1.ebuild
 1911091639 ./net-misc/tiers/tiers-1.1.ebuild
@@ -23294,7 +23313,6 @@
 2012231444 ./net-p2p/go-ethereum/go-ethereum-1.9.15.ebuild
 1909281009 ./net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.22.ebuild
 2010101039 ./net-p2p/go-ipfs-bin/go-ipfs-bin-0.7.0.ebuild
-2003031809 ./net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild
 2102011139 ./net-p2p/gtk-gnutella/gtk-gnutella-1.2.0-r1.ebuild
 2012231444 ./net-p2p/gtorrentviewer/gtorrentviewer-0.2b.ebuild
 2012122109 ./net-p2p/ktorrent/ktorrent-5.2.0-r1.ebuild
@@ -23517,7 +23535,7 @@
 2101061839 ./net-vpn/tinc/tinc-1.0.36.ebuild
 2101061839 ./net-vpn/tinc/tinc-1.1_pre17-r1.ebuild
 2011230409 ./net-vpn/tor/tor-0.4.4.6.ebuild
-2011262039 ./net-vpn/tor/tor-0.4.5.2_alpha.ebuild
+2102020039 ./net-vpn/tor/tor-0.4.5.4_rc.ebuild
 2009061309 ./net-vpn/vpnc/vpnc-0.5.3_p550-r2.ebuild
 1703171656 ./net-vpn/vpncwatch/vpncwatch-1.8.1.ebuild
 2101121409 ./net-vpn/vtun/vtun-3.0.3-r2.ebuild
@@ -23549,8 +23567,8 @@
 2007210509 ./net-wireless/bladerf/bladerf-9999.ebuild
 2101011339 ./net-wireless/bladerf/bladerf-2019.07.ebuild
 2101310343 ./net-wireless/blueberry/blueberry-1.3.9.ebuild
-2101310343 ./net-wireless/blueman/blueman-2.1.4.ebuild
-2101310343 ./net-wireless/blueman/blueman-9999.ebuild
+2102012209 ./net-wireless/blueman/blueman-2.1.4.ebuild
+2102012209 ./net-wireless/blueman/blueman-9999.ebuild
 2004041439 ./net-wireless/bluez-hcidump/bluez-hcidump-2.5.ebuild
 2004101909 ./net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild
 2101310343 ./net-wireless/bluez/bluez-5.55.ebuild
@@ -24127,8 +24145,8 @@
 2101310343 ./sci-chemistry/gromacs/gromacs-2020.5.ebuild
 2101310343 ./sci-chemistry/gromacs/gromacs-2020.9999.ebuild
 2101310343 ./sci-chemistry/gromacs/gromacs-2021.9999.ebuild
-2101310343 ./sci-chemistry/gromacs/gromacs-2021_rc1.ebuild
 2101310343 ./sci-chemistry/gromacs/gromacs-9999.ebuild
+2102011539 ./sci-chemistry/gromacs/gromacs-2021.ebuild
 2009162339 ./sci-chemistry/ksdssp/ksdssp-040728-r1.ebuild
 2009162339 ./sci-chemistry/mars/mars-1.2.ebuild
 2101310343 ./sci-chemistry/mdtraj/mdtraj-1.9.4.ebuild
@@ -24904,773 +24922,510 @@
 2011251039 ./sec-policy/apparmor-profiles/apparmor-profiles-3.0.0-r1.ebuild
 2011251039 ./sec-policy/apparmor-profiles/apparmor-profiles-9999.ebuild
 2012081009 ./sec-policy/apparmor-profiles/apparmor-profiles-3.0.1.ebuild
-2010120609 ./sec-policy/selinux-abrt/selinux-abrt-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-abrt/selinux-abrt-9999.ebuild
 2012030639 ./sec-policy/selinux-abrt/selinux-abrt-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-accountsd/selinux-accountsd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-accountsd/selinux-accountsd-9999.ebuild
 2012030639 ./sec-policy/selinux-accountsd/selinux-accountsd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-acct/selinux-acct-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-acct/selinux-acct-9999.ebuild
 2012030639 ./sec-policy/selinux-acct/selinux-acct-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-ada/selinux-ada-2.20190609-r1.ebuild
-2010120609 ./sec-policy/selinux-afs/selinux-afs-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-afs/selinux-afs-9999.ebuild
 2012030639 ./sec-policy/selinux-afs/selinux-afs-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-aide/selinux-aide-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-aide/selinux-aide-9999.ebuild
 2012030639 ./sec-policy/selinux-aide/selinux-aide-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-alsa/selinux-alsa-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-alsa/selinux-alsa-9999.ebuild
 2012030639 ./sec-policy/selinux-alsa/selinux-alsa-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-amanda/selinux-amanda-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-amanda/selinux-amanda-9999.ebuild
 2012030639 ./sec-policy/selinux-amanda/selinux-amanda-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-amavis/selinux-amavis-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-amavis/selinux-amavis-9999.ebuild
 2012030639 ./sec-policy/selinux-amavis/selinux-amavis-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-android/selinux-android-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-android/selinux-android-9999.ebuild
 2012030639 ./sec-policy/selinux-android/selinux-android-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-apache/selinux-apache-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-apache/selinux-apache-9999.ebuild
 2012030639 ./sec-policy/selinux-apache/selinux-apache-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-apcupsd/selinux-apcupsd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
 2012030639 ./sec-policy/selinux-apcupsd/selinux-apcupsd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-apm/selinux-apm-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-apm/selinux-apm-9999.ebuild
 2012030639 ./sec-policy/selinux-apm/selinux-apm-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-arpwatch/selinux-arpwatch-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-arpwatch/selinux-arpwatch-9999.ebuild
 2012030639 ./sec-policy/selinux-arpwatch/selinux-arpwatch-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-asterisk/selinux-asterisk-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-asterisk/selinux-asterisk-9999.ebuild
 2012030639 ./sec-policy/selinux-asterisk/selinux-asterisk-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-at/selinux-at-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-at/selinux-at-9999.ebuild
 2012030639 ./sec-policy/selinux-at/selinux-at-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-automount/selinux-automount-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-automount/selinux-automount-9999.ebuild
 2012030639 ./sec-policy/selinux-automount/selinux-automount-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-avahi/selinux-avahi-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-avahi/selinux-avahi-9999.ebuild
 2012030639 ./sec-policy/selinux-avahi/selinux-avahi-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-awstats/selinux-awstats-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-awstats/selinux-awstats-9999.ebuild
 2012030639 ./sec-policy/selinux-awstats/selinux-awstats-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-backup/selinux-backup-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-backup/selinux-backup-9999.ebuild
 2012030639 ./sec-policy/selinux-backup/selinux-backup-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-bacula/selinux-bacula-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-bacula/selinux-bacula-9999.ebuild
 2012030639 ./sec-policy/selinux-bacula/selinux-bacula-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-base-policy/selinux-base-policy-2.20190609-r1.ebuild
-2011300739 ./sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
 2012030639 ./sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild
-2011030839 ./sec-policy/selinux-base/selinux-base-2.20190609-r1.ebuild
+2102020739 ./sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
 2011300739 ./sec-policy/selinux-base/selinux-base-9999.ebuild
 2012030639 ./sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-bind/selinux-bind-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-bind/selinux-bind-9999.ebuild
 2012030639 ./sec-policy/selinux-bind/selinux-bind-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-bitcoin/selinux-bitcoin-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-bitcoin/selinux-bitcoin-9999.ebuild
 2012030639 ./sec-policy/selinux-bitcoin/selinux-bitcoin-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-bitlbee/selinux-bitlbee-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-bitlbee/selinux-bitlbee-9999.ebuild
 2012030639 ./sec-policy/selinux-bitlbee/selinux-bitlbee-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-bluetooth/selinux-bluetooth-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-bluetooth/selinux-bluetooth-9999.ebuild
 2012030639 ./sec-policy/selinux-bluetooth/selinux-bluetooth-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-brctl/selinux-brctl-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-brctl/selinux-brctl-9999.ebuild
 2012030639 ./sec-policy/selinux-brctl/selinux-brctl-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-cachefilesd/selinux-cachefilesd-9999.ebuild
 2012030639 ./sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-calamaris/selinux-calamaris-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-calamaris/selinux-calamaris-9999.ebuild
 2012030639 ./sec-policy/selinux-calamaris/selinux-calamaris-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-canna/selinux-canna-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-canna/selinux-canna-9999.ebuild
 2012030639 ./sec-policy/selinux-canna/selinux-canna-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-ccs/selinux-ccs-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-ccs/selinux-ccs-9999.ebuild
 2012030639 ./sec-policy/selinux-ccs/selinux-ccs-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-cdrecord/selinux-cdrecord-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-cdrecord/selinux-cdrecord-9999.ebuild
 2012030639 ./sec-policy/selinux-cdrecord/selinux-cdrecord-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-ceph/selinux-ceph-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-ceph/selinux-ceph-9999.ebuild
 2012030639 ./sec-policy/selinux-ceph/selinux-ceph-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-cgmanager/selinux-cgmanager-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-cgmanager/selinux-cgmanager-9999.ebuild
 2012030639 ./sec-policy/selinux-cgmanager/selinux-cgmanager-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-cgroup/selinux-cgroup-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-cgroup/selinux-cgroup-9999.ebuild
 2012030639 ./sec-policy/selinux-cgroup/selinux-cgroup-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-chromium/selinux-chromium-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-chromium/selinux-chromium-9999.ebuild
 2012030639 ./sec-policy/selinux-chromium/selinux-chromium-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-chronyd/selinux-chronyd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-chronyd/selinux-chronyd-9999.ebuild
 2012030639 ./sec-policy/selinux-chronyd/selinux-chronyd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-clamav/selinux-clamav-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-clamav/selinux-clamav-9999.ebuild
 2012030639 ./sec-policy/selinux-clamav/selinux-clamav-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-clockspeed/selinux-clockspeed-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-clockspeed/selinux-clockspeed-9999.ebuild
 2012030639 ./sec-policy/selinux-clockspeed/selinux-clockspeed-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-collectd/selinux-collectd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-collectd/selinux-collectd-9999.ebuild
 2012030639 ./sec-policy/selinux-collectd/selinux-collectd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-corosync/selinux-corosync-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-corosync/selinux-corosync-9999.ebuild
 2012030639 ./sec-policy/selinux-corosync/selinux-corosync-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-couchdb/selinux-couchdb-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-couchdb/selinux-couchdb-9999.ebuild
 2012030639 ./sec-policy/selinux-couchdb/selinux-couchdb-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-courier/selinux-courier-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-courier/selinux-courier-9999.ebuild
 2012030639 ./sec-policy/selinux-courier/selinux-courier-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-cpucontrol/selinux-cpucontrol-9999.ebuild
 2012030639 ./sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-9999.ebuild
 2012030639 ./sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-cups/selinux-cups-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-cups/selinux-cups-9999.ebuild
 2012030639 ./sec-policy/selinux-cups/selinux-cups-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-cvs/selinux-cvs-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-cvs/selinux-cvs-9999.ebuild
 2012030639 ./sec-policy/selinux-cvs/selinux-cvs-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-cyphesis/selinux-cyphesis-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-cyphesis/selinux-cyphesis-9999.ebuild
 2012030639 ./sec-policy/selinux-cyphesis/selinux-cyphesis-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-daemontools/selinux-daemontools-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-daemontools/selinux-daemontools-9999.ebuild
 2012030639 ./sec-policy/selinux-daemontools/selinux-daemontools-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-dante/selinux-dante-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-dante/selinux-dante-9999.ebuild
 2012030639 ./sec-policy/selinux-dante/selinux-dante-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-dbadm/selinux-dbadm-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-dbadm/selinux-dbadm-9999.ebuild
 2012030639 ./sec-policy/selinux-dbadm/selinux-dbadm-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-dbskk/selinux-dbskk-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-dbskk/selinux-dbskk-9999.ebuild
 2012030639 ./sec-policy/selinux-dbskk/selinux-dbskk-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-dbus/selinux-dbus-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-dbus/selinux-dbus-9999.ebuild
 2012030639 ./sec-policy/selinux-dbus/selinux-dbus-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-dcc/selinux-dcc-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-dcc/selinux-dcc-9999.ebuild
 2012030639 ./sec-policy/selinux-dcc/selinux-dcc-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-ddclient/selinux-ddclient-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-ddclient/selinux-ddclient-9999.ebuild
 2012030639 ./sec-policy/selinux-ddclient/selinux-ddclient-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-ddcprobe/selinux-ddcprobe-9999.ebuild
 2012030639 ./sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-denyhosts/selinux-denyhosts-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-denyhosts/selinux-denyhosts-9999.ebuild
 2012030639 ./sec-policy/selinux-denyhosts/selinux-denyhosts-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-devicekit/selinux-devicekit-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-devicekit/selinux-devicekit-9999.ebuild
 2012030639 ./sec-policy/selinux-devicekit/selinux-devicekit-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-dhcp/selinux-dhcp-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-dhcp/selinux-dhcp-9999.ebuild
 2012030639 ./sec-policy/selinux-dhcp/selinux-dhcp-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-dictd/selinux-dictd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-dictd/selinux-dictd-9999.ebuild
 2012030639 ./sec-policy/selinux-dictd/selinux-dictd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-dirmngr/selinux-dirmngr-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-dirmngr/selinux-dirmngr-9999.ebuild
 2012030639 ./sec-policy/selinux-dirmngr/selinux-dirmngr-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-dirsrv/selinux-dirsrv-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild
 2012030639 ./sec-policy/selinux-dirsrv/selinux-dirsrv-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-distcc/selinux-distcc-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-distcc/selinux-distcc-9999.ebuild
 2012030639 ./sec-policy/selinux-distcc/selinux-distcc-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-djbdns/selinux-djbdns-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-djbdns/selinux-djbdns-9999.ebuild
 2012030639 ./sec-policy/selinux-djbdns/selinux-djbdns-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-dkim/selinux-dkim-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-dkim/selinux-dkim-9999.ebuild
 2012030639 ./sec-policy/selinux-dkim/selinux-dkim-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-dmidecode/selinux-dmidecode-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-dmidecode/selinux-dmidecode-9999.ebuild
 2012030639 ./sec-policy/selinux-dmidecode/selinux-dmidecode-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-dnsmasq/selinux-dnsmasq-9999.ebuild
 2012030639 ./sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-dovecot/selinux-dovecot-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-dovecot/selinux-dovecot-9999.ebuild
 2012030639 ./sec-policy/selinux-dovecot/selinux-dovecot-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-dpkg/selinux-dpkg-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-dpkg/selinux-dpkg-9999.ebuild
 2012030639 ./sec-policy/selinux-dpkg/selinux-dpkg-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-dracut/selinux-dracut-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-dracut/selinux-dracut-9999.ebuild
 2012030639 ./sec-policy/selinux-dracut/selinux-dracut-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-dropbox/selinux-dropbox-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-dropbox/selinux-dropbox-9999.ebuild
 2012030639 ./sec-policy/selinux-dropbox/selinux-dropbox-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-entropyd/selinux-entropyd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-entropyd/selinux-entropyd-9999.ebuild
 2012030639 ./sec-policy/selinux-entropyd/selinux-entropyd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-evolution/selinux-evolution-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-evolution/selinux-evolution-9999.ebuild
 2012030639 ./sec-policy/selinux-evolution/selinux-evolution-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-exim/selinux-exim-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-exim/selinux-exim-9999.ebuild
 2012030639 ./sec-policy/selinux-exim/selinux-exim-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-fail2ban/selinux-fail2ban-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-fail2ban/selinux-fail2ban-9999.ebuild
 2012030639 ./sec-policy/selinux-fail2ban/selinux-fail2ban-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-fetchmail/selinux-fetchmail-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-fetchmail/selinux-fetchmail-9999.ebuild
 2012030639 ./sec-policy/selinux-fetchmail/selinux-fetchmail-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-finger/selinux-finger-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-finger/selinux-finger-9999.ebuild
 2012030639 ./sec-policy/selinux-finger/selinux-finger-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-flash/selinux-flash-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-flash/selinux-flash-9999.ebuild
 2012030639 ./sec-policy/selinux-flash/selinux-flash-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-fprintd/selinux-fprintd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-fprintd/selinux-fprintd-9999.ebuild
 2012030639 ./sec-policy/selinux-fprintd/selinux-fprintd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-ftp/selinux-ftp-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-ftp/selinux-ftp-9999.ebuild
 2012030639 ./sec-policy/selinux-ftp/selinux-ftp-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-games/selinux-games-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-games/selinux-games-9999.ebuild
 2012030639 ./sec-policy/selinux-games/selinux-games-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-gatekeeper/selinux-gatekeeper-9999.ebuild
 2012030639 ./sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-git/selinux-git-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-git/selinux-git-9999.ebuild
 2012030639 ./sec-policy/selinux-git/selinux-git-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-gitosis/selinux-gitosis-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-gitosis/selinux-gitosis-9999.ebuild
 2012030639 ./sec-policy/selinux-gitosis/selinux-gitosis-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-gnome/selinux-gnome-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-gnome/selinux-gnome-9999.ebuild
 2012030639 ./sec-policy/selinux-gnome/selinux-gnome-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-googletalk/selinux-googletalk-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-googletalk/selinux-googletalk-9999.ebuild
 2012030639 ./sec-policy/selinux-googletalk/selinux-googletalk-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-gorg/selinux-gorg-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-gorg/selinux-gorg-9999.ebuild
 2012030639 ./sec-policy/selinux-gorg/selinux-gorg-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-gpg/selinux-gpg-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-gpg/selinux-gpg-9999.ebuild
 2012030639 ./sec-policy/selinux-gpg/selinux-gpg-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-gpm/selinux-gpm-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-gpm/selinux-gpm-9999.ebuild
 2012030639 ./sec-policy/selinux-gpm/selinux-gpm-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-gpsd/selinux-gpsd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-gpsd/selinux-gpsd-9999.ebuild
 2012030639 ./sec-policy/selinux-gpsd/selinux-gpsd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-gssproxy/selinux-gssproxy-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-gssproxy/selinux-gssproxy-9999.ebuild
 2012030639 ./sec-policy/selinux-gssproxy/selinux-gssproxy-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-hddtemp/selinux-hddtemp-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-hddtemp/selinux-hddtemp-9999.ebuild
 2012030639 ./sec-policy/selinux-hddtemp/selinux-hddtemp-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-howl/selinux-howl-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-howl/selinux-howl-9999.ebuild
 2012030639 ./sec-policy/selinux-howl/selinux-howl-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-icecast/selinux-icecast-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-icecast/selinux-icecast-9999.ebuild
 2012030639 ./sec-policy/selinux-icecast/selinux-icecast-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-ifplugd/selinux-ifplugd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-ifplugd/selinux-ifplugd-9999.ebuild
 2012030639 ./sec-policy/selinux-ifplugd/selinux-ifplugd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-imaze/selinux-imaze-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-imaze/selinux-imaze-9999.ebuild
 2012030639 ./sec-policy/selinux-imaze/selinux-imaze-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-inetd/selinux-inetd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-inetd/selinux-inetd-9999.ebuild
 2012030639 ./sec-policy/selinux-inetd/selinux-inetd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-inn/selinux-inn-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-inn/selinux-inn-9999.ebuild
 2012030639 ./sec-policy/selinux-inn/selinux-inn-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-ipsec/selinux-ipsec-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-ipsec/selinux-ipsec-9999.ebuild
 2012030639 ./sec-policy/selinux-ipsec/selinux-ipsec-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-irc/selinux-irc-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-irc/selinux-irc-9999.ebuild
 2012030639 ./sec-policy/selinux-irc/selinux-irc-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-ircd/selinux-ircd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-ircd/selinux-ircd-9999.ebuild
 2012030639 ./sec-policy/selinux-ircd/selinux-ircd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-irqbalance/selinux-irqbalance-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-irqbalance/selinux-irqbalance-9999.ebuild
 2012030639 ./sec-policy/selinux-irqbalance/selinux-irqbalance-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-jabber/selinux-jabber-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-jabber/selinux-jabber-9999.ebuild
 2012030639 ./sec-policy/selinux-jabber/selinux-jabber-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-java/selinux-java-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-java/selinux-java-9999.ebuild
 2012030639 ./sec-policy/selinux-java/selinux-java-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-kdeconnect/selinux-kdeconnect-9999.ebuild
 2012030639 ./sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-kdump/selinux-kdump-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-kdump/selinux-kdump-9999.ebuild
 2012030639 ./sec-policy/selinux-kdump/selinux-kdump-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-kerberos/selinux-kerberos-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-kerberos/selinux-kerberos-9999.ebuild
 2012030639 ./sec-policy/selinux-kerberos/selinux-kerberos-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-kerneloops/selinux-kerneloops-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-kerneloops/selinux-kerneloops-9999.ebuild
 2012030639 ./sec-policy/selinux-kerneloops/selinux-kerneloops-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-kismet/selinux-kismet-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-kismet/selinux-kismet-9999.ebuild
 2012030639 ./sec-policy/selinux-kismet/selinux-kismet-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-ksmtuned/selinux-ksmtuned-9999.ebuild
 2012030639 ./sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-kudzu/selinux-kudzu-2.20190609-r1.ebuild
-2011300739 ./sec-policy/selinux-kudzu/selinux-kudzu-9999.ebuild
 2012030639 ./sec-policy/selinux-kudzu/selinux-kudzu-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-ldap/selinux-ldap-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-ldap/selinux-ldap-9999.ebuild
 2012030639 ./sec-policy/selinux-ldap/selinux-ldap-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-links/selinux-links-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-links/selinux-links-9999.ebuild
 2012030639 ./sec-policy/selinux-links/selinux-links-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-lircd/selinux-lircd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-lircd/selinux-lircd-9999.ebuild
 2012030639 ./sec-policy/selinux-lircd/selinux-lircd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-loadkeys/selinux-loadkeys-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-loadkeys/selinux-loadkeys-9999.ebuild
 2012030639 ./sec-policy/selinux-loadkeys/selinux-loadkeys-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-lockdev/selinux-lockdev-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-lockdev/selinux-lockdev-9999.ebuild
 2012030639 ./sec-policy/selinux-lockdev/selinux-lockdev-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-logrotate/selinux-logrotate-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-logrotate/selinux-logrotate-9999.ebuild
 2012030639 ./sec-policy/selinux-logrotate/selinux-logrotate-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-logsentry/selinux-logsentry-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-logsentry/selinux-logsentry-9999.ebuild
 2012030639 ./sec-policy/selinux-logsentry/selinux-logsentry-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-logwatch/selinux-logwatch-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-logwatch/selinux-logwatch-9999.ebuild
 2012030639 ./sec-policy/selinux-logwatch/selinux-logwatch-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-lpd/selinux-lpd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-lpd/selinux-lpd-9999.ebuild
 2012030639 ./sec-policy/selinux-lpd/selinux-lpd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-mailman/selinux-mailman-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-mailman/selinux-mailman-9999.ebuild
 2012030639 ./sec-policy/selinux-mailman/selinux-mailman-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-makewhatis/selinux-makewhatis-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-makewhatis/selinux-makewhatis-9999.ebuild
 2012030639 ./sec-policy/selinux-makewhatis/selinux-makewhatis-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-mandb/selinux-mandb-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-mandb/selinux-mandb-9999.ebuild
 2012030639 ./sec-policy/selinux-mandb/selinux-mandb-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-mcelog/selinux-mcelog-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-mcelog/selinux-mcelog-9999.ebuild
 2012030639 ./sec-policy/selinux-mcelog/selinux-mcelog-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-memcached/selinux-memcached-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-memcached/selinux-memcached-9999.ebuild
 2012030639 ./sec-policy/selinux-memcached/selinux-memcached-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-milter/selinux-milter-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-milter/selinux-milter-9999.ebuild
 2012030639 ./sec-policy/selinux-milter/selinux-milter-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-modemmanager/selinux-modemmanager-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-modemmanager/selinux-modemmanager-9999.ebuild
 2012030639 ./sec-policy/selinux-modemmanager/selinux-modemmanager-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-mono/selinux-mono-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-mono/selinux-mono-9999.ebuild
 2012030639 ./sec-policy/selinux-mono/selinux-mono-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-mozilla/selinux-mozilla-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-mozilla/selinux-mozilla-9999.ebuild
 2012030639 ./sec-policy/selinux-mozilla/selinux-mozilla-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-mpd/selinux-mpd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-mpd/selinux-mpd-9999.ebuild
 2012030639 ./sec-policy/selinux-mpd/selinux-mpd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-mplayer/selinux-mplayer-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-mplayer/selinux-mplayer-9999.ebuild
 2012030639 ./sec-policy/selinux-mplayer/selinux-mplayer-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-mrtg/selinux-mrtg-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-mrtg/selinux-mrtg-9999.ebuild
 2012030639 ./sec-policy/selinux-mrtg/selinux-mrtg-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-munin/selinux-munin-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-munin/selinux-munin-9999.ebuild
 2012030639 ./sec-policy/selinux-munin/selinux-munin-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-mutt/selinux-mutt-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-mutt/selinux-mutt-9999.ebuild
 2012030639 ./sec-policy/selinux-mutt/selinux-mutt-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-mysql/selinux-mysql-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-mysql/selinux-mysql-9999.ebuild
 2012030639 ./sec-policy/selinux-mysql/selinux-mysql-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-nagios/selinux-nagios-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-nagios/selinux-nagios-9999.ebuild
 2012030639 ./sec-policy/selinux-nagios/selinux-nagios-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-ncftool/selinux-ncftool-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-ncftool/selinux-ncftool-9999.ebuild
 2012030639 ./sec-policy/selinux-ncftool/selinux-ncftool-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-networkmanager/selinux-networkmanager-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-networkmanager/selinux-networkmanager-9999.ebuild
 2012030639 ./sec-policy/selinux-networkmanager/selinux-networkmanager-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-nginx/selinux-nginx-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-nginx/selinux-nginx-9999.ebuild
 2012030639 ./sec-policy/selinux-nginx/selinux-nginx-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-nslcd/selinux-nslcd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-nslcd/selinux-nslcd-9999.ebuild
 2012030639 ./sec-policy/selinux-nslcd/selinux-nslcd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-ntop/selinux-ntop-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-ntop/selinux-ntop-9999.ebuild
 2012030639 ./sec-policy/selinux-ntop/selinux-ntop-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-ntp/selinux-ntp-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-ntp/selinux-ntp-9999.ebuild
 2012030639 ./sec-policy/selinux-ntp/selinux-ntp-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-nut/selinux-nut-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-nut/selinux-nut-9999.ebuild
 2012030639 ./sec-policy/selinux-nut/selinux-nut-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-nx/selinux-nx-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-nx/selinux-nx-9999.ebuild
 2012030639 ./sec-policy/selinux-nx/selinux-nx-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-oddjob/selinux-oddjob-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-oddjob/selinux-oddjob-9999.ebuild
 2012030639 ./sec-policy/selinux-oddjob/selinux-oddjob-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-oident/selinux-oident-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-oident/selinux-oident-9999.ebuild
 2012030639 ./sec-policy/selinux-oident/selinux-oident-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-openct/selinux-openct-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-openct/selinux-openct-9999.ebuild
 2012030639 ./sec-policy/selinux-openct/selinux-openct-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-openrc/selinux-openrc-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-openrc/selinux-openrc-9999.ebuild
 2012030639 ./sec-policy/selinux-openrc/selinux-openrc-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-openvpn/selinux-openvpn-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-openvpn/selinux-openvpn-9999.ebuild
 2012030639 ./sec-policy/selinux-openvpn/selinux-openvpn-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-pan/selinux-pan-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-pan/selinux-pan-9999.ebuild
 2012030639 ./sec-policy/selinux-pan/selinux-pan-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-pcmcia/selinux-pcmcia-2.20190609-r1.ebuild
-2011300739 ./sec-policy/selinux-pcmcia/selinux-pcmcia-9999.ebuild
 2012030639 ./sec-policy/selinux-pcmcia/selinux-pcmcia-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-pcscd/selinux-pcscd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-pcscd/selinux-pcscd-9999.ebuild
 2012030639 ./sec-policy/selinux-pcscd/selinux-pcscd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-phpfpm/selinux-phpfpm-9999.ebuild
 2012030639 ./sec-policy/selinux-phpfpm/selinux-phpfpm-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-plymouthd/selinux-plymouthd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-plymouthd/selinux-plymouthd-9999.ebuild
 2012030639 ./sec-policy/selinux-plymouthd/selinux-plymouthd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-podsleuth/selinux-podsleuth-2.20190609-r1.ebuild
-2011300739 ./sec-policy/selinux-podsleuth/selinux-podsleuth-9999.ebuild
 2012030639 ./sec-policy/selinux-podsleuth/selinux-podsleuth-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-policykit/selinux-policykit-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-policykit/selinux-policykit-9999.ebuild
 2012030639 ./sec-policy/selinux-policykit/selinux-policykit-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-portmap/selinux-portmap-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-portmap/selinux-portmap-9999.ebuild
 2012030639 ./sec-policy/selinux-portmap/selinux-portmap-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-postfix/selinux-postfix-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-postfix/selinux-postfix-9999.ebuild
 2012030639 ./sec-policy/selinux-postfix/selinux-postfix-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-postgresql/selinux-postgresql-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-postgresql/selinux-postgresql-9999.ebuild
 2012030639 ./sec-policy/selinux-postgresql/selinux-postgresql-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-postgrey/selinux-postgrey-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-postgrey/selinux-postgrey-9999.ebuild
 2012030639 ./sec-policy/selinux-postgrey/selinux-postgrey-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-ppp/selinux-ppp-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-ppp/selinux-ppp-9999.ebuild
 2012030639 ./sec-policy/selinux-ppp/selinux-ppp-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-prelink/selinux-prelink-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-prelink/selinux-prelink-9999.ebuild
 2012030639 ./sec-policy/selinux-prelink/selinux-prelink-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-prelude/selinux-prelude-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-prelude/selinux-prelude-9999.ebuild
 2012030639 ./sec-policy/selinux-prelude/selinux-prelude-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-privoxy/selinux-privoxy-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-privoxy/selinux-privoxy-9999.ebuild
 2012030639 ./sec-policy/selinux-privoxy/selinux-privoxy-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-procmail/selinux-procmail-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-procmail/selinux-procmail-9999.ebuild
 2012030639 ./sec-policy/selinux-procmail/selinux-procmail-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-psad/selinux-psad-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-psad/selinux-psad-9999.ebuild
 2012030639 ./sec-policy/selinux-psad/selinux-psad-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-publicfile/selinux-publicfile-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-publicfile/selinux-publicfile-9999.ebuild
 2012030639 ./sec-policy/selinux-publicfile/selinux-publicfile-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-pulseaudio/selinux-pulseaudio-9999.ebuild
 2012030639 ./sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-puppet/selinux-puppet-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-puppet/selinux-puppet-9999.ebuild
 2012030639 ./sec-policy/selinux-puppet/selinux-puppet-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-pyicqt/selinux-pyicqt-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-pyicqt/selinux-pyicqt-9999.ebuild
 2012030639 ./sec-policy/selinux-pyicqt/selinux-pyicqt-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-pyzor/selinux-pyzor-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-pyzor/selinux-pyzor-9999.ebuild
 2012030639 ./sec-policy/selinux-pyzor/selinux-pyzor-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-qemu/selinux-qemu-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-qemu/selinux-qemu-9999.ebuild
 2012030639 ./sec-policy/selinux-qemu/selinux-qemu-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-qmail/selinux-qmail-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-qmail/selinux-qmail-9999.ebuild
 2012030639 ./sec-policy/selinux-qmail/selinux-qmail-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-quota/selinux-quota-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-quota/selinux-quota-9999.ebuild
 2012030639 ./sec-policy/selinux-quota/selinux-quota-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-radius/selinux-radius-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-radius/selinux-radius-9999.ebuild
 2012030639 ./sec-policy/selinux-radius/selinux-radius-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-radvd/selinux-radvd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-radvd/selinux-radvd-9999.ebuild
 2012030639 ./sec-policy/selinux-radvd/selinux-radvd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-razor/selinux-razor-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-razor/selinux-razor-9999.ebuild
 2012030639 ./sec-policy/selinux-razor/selinux-razor-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-redis/selinux-redis-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-redis/selinux-redis-9999.ebuild
 2012030639 ./sec-policy/selinux-redis/selinux-redis-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-remotelogin/selinux-remotelogin-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-remotelogin/selinux-remotelogin-9999.ebuild
 2012030639 ./sec-policy/selinux-remotelogin/selinux-remotelogin-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-resolvconf/selinux-resolvconf-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-resolvconf/selinux-resolvconf-9999.ebuild
 2012030639 ./sec-policy/selinux-resolvconf/selinux-resolvconf-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-rgmanager/selinux-rgmanager-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-rgmanager/selinux-rgmanager-9999.ebuild
 2012030639 ./sec-policy/selinux-rgmanager/selinux-rgmanager-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-rngd/selinux-rngd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-rngd/selinux-rngd-9999.ebuild
 2012030639 ./sec-policy/selinux-rngd/selinux-rngd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-roundup/selinux-roundup-2.20190609-r1.ebuild
-2011300739 ./sec-policy/selinux-roundup/selinux-roundup-9999.ebuild
 2012030639 ./sec-policy/selinux-roundup/selinux-roundup-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-rpc/selinux-rpc-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-rpc/selinux-rpc-9999.ebuild
 2012030639 ./sec-policy/selinux-rpc/selinux-rpc-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-rpcbind/selinux-rpcbind-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-rpcbind/selinux-rpcbind-9999.ebuild
 2012030639 ./sec-policy/selinux-rpcbind/selinux-rpcbind-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-rpm/selinux-rpm-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-rpm/selinux-rpm-9999.ebuild
 2012030639 ./sec-policy/selinux-rpm/selinux-rpm-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-rssh/selinux-rssh-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-rssh/selinux-rssh-9999.ebuild
 2012030639 ./sec-policy/selinux-rssh/selinux-rssh-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-rtkit/selinux-rtkit-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-rtkit/selinux-rtkit-9999.ebuild
 2012030639 ./sec-policy/selinux-rtkit/selinux-rtkit-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-rtorrent/selinux-rtorrent-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-rtorrent/selinux-rtorrent-9999.ebuild
 2012030639 ./sec-policy/selinux-rtorrent/selinux-rtorrent-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-salt/selinux-salt-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-salt/selinux-salt-9999.ebuild
 2012030639 ./sec-policy/selinux-salt/selinux-salt-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-samba/selinux-samba-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-samba/selinux-samba-9999.ebuild
 2012030639 ./sec-policy/selinux-samba/selinux-samba-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-sasl/selinux-sasl-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-sasl/selinux-sasl-9999.ebuild
 2012030639 ./sec-policy/selinux-sasl/selinux-sasl-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-screen/selinux-screen-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-screen/selinux-screen-9999.ebuild
 2012030639 ./sec-policy/selinux-screen/selinux-screen-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-sendmail/selinux-sendmail-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-sendmail/selinux-sendmail-9999.ebuild
 2012030639 ./sec-policy/selinux-sendmail/selinux-sendmail-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-sensord/selinux-sensord-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-sensord/selinux-sensord-9999.ebuild
 2012030639 ./sec-policy/selinux-sensord/selinux-sensord-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-shorewall/selinux-shorewall-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-shorewall/selinux-shorewall-9999.ebuild
 2012030639 ./sec-policy/selinux-shorewall/selinux-shorewall-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-shutdown/selinux-shutdown-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-shutdown/selinux-shutdown-9999.ebuild
 2012030639 ./sec-policy/selinux-shutdown/selinux-shutdown-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-skype/selinux-skype-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-skype/selinux-skype-9999.ebuild
 2012030639 ./sec-policy/selinux-skype/selinux-skype-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-slocate/selinux-slocate-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-slocate/selinux-slocate-9999.ebuild
 2012030639 ./sec-policy/selinux-slocate/selinux-slocate-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-slrnpull/selinux-slrnpull-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-slrnpull/selinux-slrnpull-9999.ebuild
 2012030639 ./sec-policy/selinux-slrnpull/selinux-slrnpull-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-smartmon/selinux-smartmon-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-smartmon/selinux-smartmon-9999.ebuild
 2012030639 ./sec-policy/selinux-smartmon/selinux-smartmon-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-smokeping/selinux-smokeping-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-smokeping/selinux-smokeping-9999.ebuild
 2012030639 ./sec-policy/selinux-smokeping/selinux-smokeping-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-snmp/selinux-snmp-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-snmp/selinux-snmp-9999.ebuild
 2012030639 ./sec-policy/selinux-snmp/selinux-snmp-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-snort/selinux-snort-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-snort/selinux-snort-9999.ebuild
 2012030639 ./sec-policy/selinux-snort/selinux-snort-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-soundserver/selinux-soundserver-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-soundserver/selinux-soundserver-9999.ebuild
 2012030639 ./sec-policy/selinux-soundserver/selinux-soundserver-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-spamassassin/selinux-spamassassin-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild
 2012030639 ./sec-policy/selinux-spamassassin/selinux-spamassassin-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-speedtouch/selinux-speedtouch-2.20190609-r1.ebuild
-2011300739 ./sec-policy/selinux-speedtouch/selinux-speedtouch-9999.ebuild
 2012030639 ./sec-policy/selinux-speedtouch/selinux-speedtouch-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-squid/selinux-squid-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-squid/selinux-squid-9999.ebuild
 2012030639 ./sec-policy/selinux-squid/selinux-squid-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-sssd/selinux-sssd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-sssd/selinux-sssd-9999.ebuild
 2012030639 ./sec-policy/selinux-sssd/selinux-sssd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-stunnel/selinux-stunnel-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-stunnel/selinux-stunnel-9999.ebuild
 2012030639 ./sec-policy/selinux-stunnel/selinux-stunnel-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-subsonic/selinux-subsonic-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-subsonic/selinux-subsonic-9999.ebuild
 2012030639 ./sec-policy/selinux-subsonic/selinux-subsonic-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-sudo/selinux-sudo-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-sudo/selinux-sudo-9999.ebuild
 2012030639 ./sec-policy/selinux-sudo/selinux-sudo-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-sxid/selinux-sxid-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-sxid/selinux-sxid-9999.ebuild
 2012030639 ./sec-policy/selinux-sxid/selinux-sxid-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-syncthing/selinux-syncthing-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-syncthing/selinux-syncthing-9999.ebuild
 2012030639 ./sec-policy/selinux-syncthing/selinux-syncthing-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-sysstat/selinux-sysstat-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-sysstat/selinux-sysstat-9999.ebuild
 2012030639 ./sec-policy/selinux-sysstat/selinux-sysstat-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-tboot/selinux-tboot-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-tboot/selinux-tboot-9999.ebuild
 2012030639 ./sec-policy/selinux-tboot/selinux-tboot-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-tcpd/selinux-tcpd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-tcpd/selinux-tcpd-9999.ebuild
 2012030639 ./sec-policy/selinux-tcpd/selinux-tcpd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-tcsd/selinux-tcsd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-tcsd/selinux-tcsd-9999.ebuild
 2012030639 ./sec-policy/selinux-tcsd/selinux-tcsd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-telnet/selinux-telnet-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-telnet/selinux-telnet-9999.ebuild
 2012030639 ./sec-policy/selinux-telnet/selinux-telnet-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-tftp/selinux-tftp-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-tftp/selinux-tftp-9999.ebuild
 2012030639 ./sec-policy/selinux-tftp/selinux-tftp-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-tgtd/selinux-tgtd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-tgtd/selinux-tgtd-9999.ebuild
 2012030639 ./sec-policy/selinux-tgtd/selinux-tgtd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-thunderbird/selinux-thunderbird-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-thunderbird/selinux-thunderbird-9999.ebuild
 2012030639 ./sec-policy/selinux-thunderbird/selinux-thunderbird-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-timidity/selinux-timidity-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-timidity/selinux-timidity-9999.ebuild
 2012030639 ./sec-policy/selinux-timidity/selinux-timidity-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-tmpreaper/selinux-tmpreaper-9999.ebuild
 2012030639 ./sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-tor/selinux-tor-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-tor/selinux-tor-9999.ebuild
 2012030639 ./sec-policy/selinux-tor/selinux-tor-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-tripwire/selinux-tripwire-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-tripwire/selinux-tripwire-9999.ebuild
 2012030639 ./sec-policy/selinux-tripwire/selinux-tripwire-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-ucspitcp/selinux-ucspitcp-9999.ebuild
 2012030639 ./sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-ulogd/selinux-ulogd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-ulogd/selinux-ulogd-9999.ebuild
 2012030639 ./sec-policy/selinux-ulogd/selinux-ulogd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-uml/selinux-uml-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-uml/selinux-uml-9999.ebuild
 2012030639 ./sec-policy/selinux-uml/selinux-uml-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-unconfined/selinux-unconfined-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-unconfined/selinux-unconfined-9999.ebuild
 2012030639 ./sec-policy/selinux-unconfined/selinux-unconfined-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-uptime/selinux-uptime-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-uptime/selinux-uptime-9999.ebuild
 2012030639 ./sec-policy/selinux-uptime/selinux-uptime-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-usbmuxd/selinux-usbmuxd-9999.ebuild
 2012030639 ./sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-uucp/selinux-uucp-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-uucp/selinux-uucp-9999.ebuild
 2012030639 ./sec-policy/selinux-uucp/selinux-uucp-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-uwimap/selinux-uwimap-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-uwimap/selinux-uwimap-9999.ebuild
 2012030639 ./sec-policy/selinux-uwimap/selinux-uwimap-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-uwsgi/selinux-uwsgi-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-uwsgi/selinux-uwsgi-9999.ebuild
 2012030639 ./sec-policy/selinux-uwsgi/selinux-uwsgi-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-varnishd/selinux-varnishd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-varnishd/selinux-varnishd-9999.ebuild
 2012030639 ./sec-policy/selinux-varnishd/selinux-varnishd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-vbetool/selinux-vbetool-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-vbetool/selinux-vbetool-9999.ebuild
 2012030639 ./sec-policy/selinux-vbetool/selinux-vbetool-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-vdagent/selinux-vdagent-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-vdagent/selinux-vdagent-9999.ebuild
 2012030639 ./sec-policy/selinux-vdagent/selinux-vdagent-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-vde/selinux-vde-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-vde/selinux-vde-9999.ebuild
 2012030639 ./sec-policy/selinux-vde/selinux-vde-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-virt/selinux-virt-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-virt/selinux-virt-9999.ebuild
 2012030639 ./sec-policy/selinux-virt/selinux-virt-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-vlock/selinux-vlock-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-vlock/selinux-vlock-9999.ebuild
 2012030639 ./sec-policy/selinux-vlock/selinux-vlock-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-vmware/selinux-vmware-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-vmware/selinux-vmware-9999.ebuild
 2012030639 ./sec-policy/selinux-vmware/selinux-vmware-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-vnstatd/selinux-vnstatd-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-vnstatd/selinux-vnstatd-9999.ebuild
 2012030639 ./sec-policy/selinux-vnstatd/selinux-vnstatd-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-vpn/selinux-vpn-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-vpn/selinux-vpn-9999.ebuild
 2012030639 ./sec-policy/selinux-vpn/selinux-vpn-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-watchdog/selinux-watchdog-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild
 2012030639 ./sec-policy/selinux-watchdog/selinux-watchdog-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-webalizer/selinux-webalizer-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-webalizer/selinux-webalizer-9999.ebuild
 2012030639 ./sec-policy/selinux-webalizer/selinux-webalizer-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-wine/selinux-wine-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-wine/selinux-wine-9999.ebuild
 2012030639 ./sec-policy/selinux-wine/selinux-wine-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-wireshark/selinux-wireshark-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-wireshark/selinux-wireshark-9999.ebuild
 2012030639 ./sec-policy/selinux-wireshark/selinux-wireshark-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-wm/selinux-wm-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-wm/selinux-wm-9999.ebuild
 2012030639 ./sec-policy/selinux-wm/selinux-wm-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-xen/selinux-xen-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-xen/selinux-xen-9999.ebuild
 2012030639 ./sec-policy/selinux-xen/selinux-xen-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-xfs/selinux-xfs-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-xfs/selinux-xfs-9999.ebuild
 2012030639 ./sec-policy/selinux-xfs/selinux-xfs-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-xprint/selinux-xprint-2.20190609-r1.ebuild
-2011300739 ./sec-policy/selinux-xprint/selinux-xprint-9999.ebuild
 2012030639 ./sec-policy/selinux-xprint/selinux-xprint-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-xscreensaver/selinux-xscreensaver-9999.ebuild
 2012030639 ./sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-xserver/selinux-xserver-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-xserver/selinux-xserver-9999.ebuild
 2012030639 ./sec-policy/selinux-xserver/selinux-xserver-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-zabbix/selinux-zabbix-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-zabbix/selinux-zabbix-9999.ebuild
 2012030639 ./sec-policy/selinux-zabbix/selinux-zabbix-2.20200818-r2.ebuild
-2010120609 ./sec-policy/selinux-colord/selinux-colord-2.20190609-r1.ebuild
 2011300739 ./sec-policy/selinux-colord/selinux-colord-9999.ebuild
 2012030639 ./sec-policy/selinux-colord/selinux-colord-2.20200818-r2.ebuild
 2010062239 ./sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild
@@ -25948,6 +25703,7 @@
 2008160409 ./sys-apps/logwatch/logwatch-9999.ebuild
 2012250139 ./sys-apps/logwatch/logwatch-7.5.4.ebuild
 2012311940 ./sys-apps/logwatch/logwatch-7.5.3.ebuild
+2102011809 ./sys-apps/logwatch/logwatch-7.5.5.ebuild
 1908101739 ./sys-apps/lsadb/lsadb-0.1.3-r1.ebuild
 2004032241 ./sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
 2002180839 ./sys-apps/lsd/lsd-0.16.0.ebuild
@@ -25976,7 +25732,7 @@
 2009181409 ./sys-apps/memtester/memtester-4.4.0.ebuild
 2010051939 ./sys-apps/memtester/memtester-4.5.0.ebuild
 1912110241 ./sys-apps/miller/miller-5.3.0.ebuild
-2101021009 ./sys-apps/miller/miller-5.10.0.ebuild
+2102011639 ./sys-apps/miller/miller-5.10.0.ebuild
 1912110241 ./sys-apps/minijail/minijail-9.ebuild
 2001251209 ./sys-apps/minijail/minijail-12.ebuild
 1702282250 ./sys-apps/minised/minised-1.15.ebuild
@@ -26075,6 +25831,7 @@
 2006070509 ./sys-apps/ripgrep/ripgrep-12.1.1.ebuild
 2002230040 ./sys-apps/rkflashtool/rkflashtool-6.1.ebuild
 2012100539 ./sys-apps/rng-tools/rng-tools-6.10-r1.ebuild
+2102011809 ./sys-apps/rng-tools/rng-tools-6.11.ebuild
 1910261809 ./sys-apps/roccat-tools/roccat-tools-5.7.0.ebuild
 2001131509 ./sys-apps/roccat-tools/roccat-tools-5.9.0.ebuild
 2012171939 ./sys-apps/roccat-tools/roccat-tools-5.9.0-r100.ebuild
@@ -26155,7 +25912,7 @@
 2011101439 ./sys-apps/sysvinit/sysvinit-2.96.ebuild
 2011171209 ./sys-apps/sysvinit/sysvinit-2.98.ebuild
 2011231109 ./sys-apps/sysvinit/sysvinit-2.97.ebuild
-2101302239 ./sys-apps/sysvinit/sysvinit-2.98-r1.ebuild
+2102012109 ./sys-apps/sysvinit/sysvinit-2.98-r1.ebuild
 2010091909 ./sys-apps/tas/tas-1.6.0.200601.ebuild
 2006162309 ./sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
 2004211009 ./sys-apps/texinfo/texinfo-6.6-r1.ebuild
@@ -26306,7 +26063,8 @@
 2010290139 ./sys-auth/pam_u2f/pam_u2f-1.1.0.ebuild
 1912110241 ./sys-auth/pam_yubico/pam_yubico-2.26.ebuild
 2012222209 ./sys-auth/pambase/pambase-20201103.ebuild
-2012222209 ./sys-auth/pambase/pambase-999999999.ebuild
+2102012239 ./sys-auth/pambase/pambase-20210201.ebuild
+2102011709 ./sys-auth/pambase/pambase-999999999.ebuild
 2012130339 ./sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild
 1802112038 ./sys-auth/polkit-pkla-compat/polkit-pkla-compat-0.1.ebuild
 1912291610 ./sys-auth/polkit-qt/polkit-qt-0.113.0.ebuild
@@ -26353,7 +26111,7 @@
 2006262339 ./sys-block/f3/f3-7.2.ebuild
 2011020309 ./sys-block/f3/f3-8.0.ebuild
 2101310343 ./sys-block/fio/fio-3.19.ebuild
-2102011139 ./sys-block/fio/fio-3.20-r2.ebuild
+2102020739 ./sys-block/fio/fio-3.20-r2.ebuild
 1702282250 ./sys-block/flashbench/flashbench-20120606.ebuild
 2009162339 ./sys-block/fwdl/fwdl-1.2.3.ebuild
 2012311940 ./sys-block/gpart/gpart-0.3.ebuild
@@ -26364,7 +26122,7 @@
 1702282250 ./sys-block/hpssacli/hpssacli-2.40.13.0-r1.ebuild
 1712221209 ./sys-block/hpssacli/hpssacli-3.10.3.0.ebuild
 1904252009 ./sys-block/io-scheduler-udev-rules/io-scheduler-udev-rules-1.ebuild
-2102011139 ./sys-block/libzbc/libzbc-5.5.1.ebuild
+2102020739 ./sys-block/libzbc/libzbc-5.5.1.ebuild
 2010272109 ./sys-block/lsiutil/lsiutil-1.62-r3.ebuild
 2008161409 ./sys-block/mbuffer/mbuffer-20200505.ebuild
 2010021539 ./sys-block/mbuffer/mbuffer-20200929.ebuild
@@ -26432,8 +26190,8 @@
 2008130109 ./sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
 2008130109 ./sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.6.ebuild
 2008130109 ./sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.5.ebuild
-2008130109 ./sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0.ebuild
-2008130109 ./sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
+2102012209 ./sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0.ebuild
+2102012209 ./sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
 1910072209 ./sys-block/tw_cli/tw_cli-10.2.2.1-r1.ebuild
 1910111911 ./sys-block/tw_cli/tw_cli-10.2.2.1.ebuild
 2012281509 ./sys-block/vblade/vblade-24.ebuild
@@ -27028,8 +26786,9 @@
 1807200709 ./sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
 1806050739 ./sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild
 2011140009 ./sys-fs/clamfs/clamfs-1.2.0.ebuild
-2009060909 ./sys-fs/compsize/compsize-9999.ebuild
-2011040409 ./sys-fs/compsize/compsize-1.3.ebuild
+2102011639 ./sys-fs/compsize/compsize-1.3.ebuild
+2102011639 ./sys-fs/compsize/compsize-1.4.ebuild
+2102011639 ./sys-fs/compsize/compsize-9999.ebuild
 1808152309 ./sys-fs/copyfs/copyfs-1.0.1-r1.ebuild
 2002112051 ./sys-fs/cramfs/cramfs-1.1.ebuild
 2008201839 ./sys-fs/cramfs/cramfs-2.1.ebuild
@@ -27277,6 +27036,7 @@
 2101110209 ./sys-kernel/git-sources/git-sources-5.11_rc3.ebuild
 2101181109 ./sys-kernel/git-sources/git-sources-5.11_rc4.ebuild
 2101251109 ./sys-kernel/git-sources/git-sources-5.11_rc5.ebuild
+2102011509 ./sys-kernel/git-sources/git-sources-5.11_rc6.ebuild
 2101310343 ./sys-kernel/kergen/kergen-0.1.5.ebuild
 1912110241 ./sys-kernel/kpatch/kpatch-9999.ebuild
 2008081539 ./sys-kernel/kpatch/kpatch-0.6.3-r1.ebuild
@@ -27474,10 +27234,11 @@
 2101310343 ./sys-libs/glibc/glibc-2.32-r6.ebuild
 2101310343 ./sys-libs/glibc/glibc-2.32-r7.ebuild
 2101310343 ./sys-libs/glibc/glibc-9999.ebuild
+2102020039 ./sys-libs/glibc/glibc-2.33.ebuild
 2004211009 ./sys-libs/gpm/gpm-1.20.7-r2.ebuild
 2011150839 ./sys-libs/gwenhywfar/gwenhywfar-5.4.1-r1.ebuild
-2010270439 ./sys-libs/kpmcore/kpmcore-4.2.0.ebuild
 2101072039 ./sys-libs/kpmcore/kpmcore-20.12.1.ebuild
+2102012109 ./sys-libs/kpmcore/kpmcore-4.2.0.ebuild
 2101310343 ./sys-libs/ldb/ldb-2.1.4-r1.ebuild
 2101310343 ./sys-libs/ldb/ldb-2.2.0-r2.ebuild
 2011241909 ./sys-libs/libaal/libaal-1.0.7-r1.ebuild
@@ -27586,6 +27347,7 @@
 2011191539 ./sys-libs/ncurses-compat/ncurses-compat-6.2.ebuild
 2012311940 ./sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild
 2101061839 ./sys-libs/ncurses/ncurses-6.2-r1.ebuild
+2102020039 ./sys-libs/ncurses/ncurses-6.2_p20210123.ebuild
 2005171239 ./sys-libs/newlib/newlib-3.3.0.ebuild
 2005201039 ./sys-libs/newlib/newlib-3.3.0-r1.ebuild
 2011212139 ./sys-libs/newlib/newlib-4.0.0.ebuild
@@ -27673,6 +27435,7 @@
 2101061139 ./sys-power/thermald/thermald-2.3-r1.ebuild
 2101282309 ./sys-power/thermald/thermald-2.4.1-r1.ebuild
 1907151840 ./sys-power/uhubctl/uhubctl-1.8-r1.ebuild
+2102020109 ./sys-power/uhubctl/uhubctl-2.3.0.ebuild
 2004032241 ./sys-power/upower/upower-0.99.9-r1.ebuild
 2012282039 ./sys-power/upower/upower-0.99.11.ebuild
 2008081539 ./sys-power/tuxedo-cc-wmi/tuxedo-cc-wmi-0.1.4-r1.ebuild
@@ -27702,6 +27465,7 @@
 1801291909 ./sys-process/dumb-init/dumb-init-1.2.1.ebuild
 2101011909 ./sys-process/evisum/evisum-0.5.8.ebuild
 2101091739 ./sys-process/evisum/evisum-0.5.9.ebuild
+2102011639 ./sys-process/evisum/evisum-0.5.10.ebuild
 2101230039 ./sys-process/fcron/fcron-3.2.1-r1.ebuild
 2101230039 ./sys-process/fcron/fcron-3.2.1-r3.ebuild
 2101230039 ./sys-process/fcron/fcron-3.3.0_beta-r1.ebuild
@@ -28170,7 +27934,7 @@
 2101280239 ./www-apps/nextcloud/nextcloud-18.0.14.ebuild
 2101280239 ./www-apps/nextcloud/nextcloud-19.0.8.ebuild
 2101280239 ./www-apps/nextcloud/nextcloud-20.0.6.ebuild
-2101312209 ./www-apps/nextcloud/nextcloud-20.0.5.ebuild
+2102011839 ./www-apps/nextcloud/nextcloud-20.0.5.ebuild
 2101310343 ./www-apps/nikola/nikola-8.0.4.ebuild
 2101310343 ./www-apps/nikola/nikola-8.1.0.ebuild
 2101310343 ./www-apps/nikola/nikola-8.1.1-r1.ebuild
@@ -28218,12 +27982,11 @@
 2009302139 ./www-client/epiphany/epiphany-3.34.4.ebuild
 2005280239 ./www-client/falkon/falkon-3.1.0-r1.ebuild
 1703072117 ./www-client/fetch/fetch-1.0-r3.ebuild
-2101071739 ./www-client/firefox-bin/firefox-bin-84.0.2.ebuild
 2101260609 ./www-client/firefox-bin/firefox-bin-78.7.0.ebuild
 2101260609 ./www-client/firefox-bin/firefox-bin-85.0.ebuild
-2101091839 ./www-client/firefox/firefox-84.0.2.ebuild
 2101260609 ./www-client/firefox/firefox-85.0.ebuild
 2102010109 ./www-client/firefox/firefox-78.7.0.ebuild
+2102011809 ./www-client/firefox/firefox-85.0-r1.ebuild
 2101282339 ./www-client/google-chrome-beta/google-chrome-beta-89.0.4389.23.ebuild
 2101282339 ./www-client/google-chrome-unstable/google-chrome-unstable-90.0.4400.8.ebuild
 2101192339 ./www-client/google-chrome/google-chrome-88.0.4324.96.ebuild
@@ -28245,6 +28008,7 @@
 2101132139 ./www-client/opera-developer/opera-developer-75.0.3932.0.ebuild
 2101182209 ./www-client/opera-developer/opera-developer-75.0.3939.0.ebuild
 2101272139 ./www-client/opera-developer/opera-developer-75.0.3946.0.ebuild
+2102020109 ./www-client/opera-developer/opera-developer-75.0.3953.0.ebuild
 2101142039 ./www-client/opera/opera-73.0.3856.344.ebuild
 2008102039 ./www-client/otter/otter-1.0.01-r1.ebuild
 2101102339 ./www-client/otter/otter-1.0.02.ebuild
@@ -28431,7 +28195,7 @@
 2012311940 ./x11-apps/xgc/xgc-1.0.5.ebuild
 2101061509 ./x11-apps/xhost/xhost-1.0.8.ebuild
 2012311940 ./x11-apps/xinit/xinit-1.4.1.ebuild
-2102010309 ./x11-apps/xinit/xinit-1.4.1-r1.ebuild
+2102012109 ./x11-apps/xinit/xinit-1.4.1-r1.ebuild
 2012311940 ./x11-apps/xinput/xinput-1.6.3.ebuild
 2006250009 ./x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r2.ebuild
 2101061509 ./x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild
@@ -28473,8 +28237,8 @@
 2005190009 ./x11-base/xorg-proto/xorg-proto-9999.ebuild
 2012041739 ./x11-base/xorg-proto/xorg-proto-2020.1.ebuild
 2012201509 ./x11-base/xorg-server/xorg-server-1.20.10.ebuild
-2101302239 ./x11-base/xorg-server/xorg-server-9999.ebuild
-2102010309 ./x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild
+2102012109 ./x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild
+2102011809 ./x11-base/xorg-server/xorg-server-9999.ebuild
 2012150109 ./x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
 2011182139 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r5.ebuild
 2011182139 ./x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r7.ebuild
@@ -28709,7 +28473,7 @@
 1703221027 ./x11-misc/3dfm/3dfm-1.0-r1.ebuild
 1705121754 ./x11-misc/accessx/accessx-0951-r2.ebuild
 2101310343 ./x11-misc/alacarte/alacarte-3.36.0.ebuild
-2101101739 ./x11-misc/albert/albert-0.17.2.ebuild
+2102012339 ./x11-misc/albert/albert-0.17.2.ebuild
 1910122139 ./x11-misc/alock/alock-1.0.0.ebuild
 1910111911 ./x11-misc/apwal/apwal-0.4.5-r2.ebuild
 2101310343 ./x11-misc/arandr/arandr-0.1.10.ebuild
@@ -29500,7 +29264,7 @@
 2007201009 ./x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6-r1.ebuild
 2101061539 ./x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild
 1702282250 ./x11-themes/gtk-engines-unico/gtk-engines-unico-1.0.3_pre20140109.ebuild
-2101241909 ./x11-themes/gtk-engines-unico/gtk-engines-unico-1.0.3_pre20140109-r1.ebuild
+2102011839 ./x11-themes/gtk-engines-unico/gtk-engines-unico-1.0.3_pre20140109-r1.ebuild
 2101301509 ./x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild
 2101061539 ./x11-themes/gtk-theme-switch/gtk-theme-switch-2.1.0-r1.ebuild
 1910200109 ./x11-themes/haematite-xcursors/haematite-xcursors-1.0.ebuild
@@ -30709,7 +30473,6 @@
 2101240209 metadata/md5-cache/app-admin/conserver-8.2.4-r1
 2101240209 metadata/md5-cache/app-admin/conserver-8.2.5-r1
 2101240209 metadata/md5-cache/app-admin/conserver-8.2.6-r1
-2101242239 metadata/md5-cache/app-admin/newsyslog-1.1.0.81-r1
 2101251709 metadata/md5-cache/app-admin/exo-1.23.0
 2101270709 metadata/md5-cache/app-admin/multilog-watch-1.12-r1
 2101270439 metadata/md5-cache/app-admin/needrestart-3.3
@@ -30780,11 +30543,14 @@
 2101310343 metadata/md5-cache/app-admin/webapp-config-9999
 2101310343 metadata/md5-cache/app-admin/xkcdpass-1.17.3-r1
 2101310343 metadata/md5-cache/app-admin/xkcdpass-1.17.6
-2102011239 metadata/md5-cache/app-admin/Manifest.gz
 2102011139 metadata/md5-cache/app-admin/doas-6.8.1
 2102011239 metadata/md5-cache/app-admin/keepassxc-2.6.4
 2102011239 metadata/md5-cache/app-admin/keepassxc-9999
 2102011139 metadata/md5-cache/app-admin/system-config-printer-1.5.15
+2102011839 metadata/md5-cache/app-admin/Manifest.gz
+2102011639 metadata/md5-cache/app-admin/doctl-1.55.0
+2102011639 metadata/md5-cache/app-admin/doctl-9999
+2102011839 metadata/md5-cache/app-admin/newsyslog-1.1.0.81-r1
 2101231224 metadata/md5-cache/app-antivirus/clamav-0.102.4
 2101231224 metadata/md5-cache/app-antivirus/clamav-0.103.0-r2
 2101310343 metadata/md5-cache/app-antivirus/Manifest.gz
@@ -31258,7 +31024,6 @@
 2101231224 metadata/md5-cache/app-crypt/libb2-0.98.1-r2
 2101231224 metadata/md5-cache/app-crypt/libb2-0.98.1-r3
 2101231224 metadata/md5-cache/app-crypt/libmd-1.0.1
-2101231224 metadata/md5-cache/app-crypt/libmd-1.0.3
 2101231224 metadata/md5-cache/app-crypt/libmd-99999
 2101231224 metadata/md5-cache/app-crypt/libnitrokey-3.5
 2101231224 metadata/md5-cache/app-crypt/libscrypt-1.21
@@ -31382,8 +31147,9 @@
 2101310343 metadata/md5-cache/app-crypt/yubikey-manager-3.1.1-r1
 2101310343 metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.4-r2
 2101310343 metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.5
-2102010109 metadata/md5-cache/app-crypt/Manifest.gz
 2102010109 metadata/md5-cache/app-crypt/mit-krb5-1.18.2-r3
+2102011639 metadata/md5-cache/app-crypt/Manifest.gz
+2102011639 metadata/md5-cache/app-crypt/libmd-1.0.3
 1910181539 metadata/md5-cache/app-dicts/bookview-3.2.1
 1808151104 metadata/md5-cache/app-dicts/freedict-deu-eng-1.0
 1807201739 metadata/md5-cache/app-dicts/mecab-naist-jdic-0.6.3b_p20111013
@@ -32199,9 +31965,10 @@
 2101310343 metadata/md5-cache/app-editors/vim-8.2.0814
 2101310343 metadata/md5-cache/app-editors/vim-8.2.0814-r100
 2101310343 metadata/md5-cache/app-editors/vim-9999
-2102010809 metadata/md5-cache/app-editors/Manifest.gz
 2102010109 metadata/md5-cache/app-editors/bluefish-2.2.12
 2102010809 metadata/md5-cache/app-editors/emacs-27.1-r3
+2102011709 metadata/md5-cache/app-editors/Manifest.gz
+2102011709 metadata/md5-cache/app-editors/okteta-0.26.5
 2012281255 metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
 2012281255 metadata/md5-cache/app-emacs/adaptive-wrap-0.7
 2012281255 metadata/md5-cache/app-emacs/analog-1.9.99
@@ -32659,7 +32426,6 @@
 2101270709 metadata/md5-cache/app-emulation/libguestfs-1.36.15-r2
 2101271639 metadata/md5-cache/app-emulation/libcacard-2.6.0
 2101291139 metadata/md5-cache/app-emulation/firecracker-bin-0.24.1
-2101312209 metadata/md5-cache/app-emulation/Manifest.gz
 2101310343 metadata/md5-cache/app-emulation/cloud-init-19.4
 2101310343 metadata/md5-cache/app-emulation/cloud-init-20.1
 2101310343 metadata/md5-cache/app-emulation/cloud-init-20.4
@@ -32691,7 +32457,6 @@
 2101310343 metadata/md5-cache/app-emulation/protontricks-1.4.3
 2101310343 metadata/md5-cache/app-emulation/qemu-5.1.0-r3
 2101310343 metadata/md5-cache/app-emulation/qemu-5.2.0-r1
-2101311309 metadata/md5-cache/app-emulation/qemu-5.2.0-r2
 2101311739 metadata/md5-cache/app-emulation/qemu-9999
 2101310343 metadata/md5-cache/app-emulation/qemu-guest-agent-4.2.0-r1
 2101310343 metadata/md5-cache/app-emulation/qemu-guest-agent-5.0.0
@@ -32716,6 +32481,12 @@
 2101310343 metadata/md5-cache/app-emulation/xen-tools-4.13.2-r1
 2101310343 metadata/md5-cache/app-emulation/xen-tools-4.13.2-r2
 2101310343 metadata/md5-cache/app-emulation/xen-tools-4.14.0-r5
+2102012239 metadata/md5-cache/app-emulation/Manifest.gz
+2102012109 metadata/md5-cache/app-emulation/qemu-5.2.0-r2
+2102012239 metadata/md5-cache/app-emulation/xen-4.13.2-r4
+2102012239 metadata/md5-cache/app-emulation/xen-4.14.1
+2102012239 metadata/md5-cache/app-emulation/xen-pvgrub-4.14.1
+2102012239 metadata/md5-cache/app-emulation/xen-tools-4.14.1
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1-r1
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1.1
 1911131109 metadata/md5-cache/app-eselect/eselect-lcdfilter-2
@@ -34146,7 +33917,6 @@
 2101231224 metadata/md5-cache/app-text/poppler-20.11.0
 2101231224 metadata/md5-cache/app-text/poppler-20.12.1
 2101231224 metadata/md5-cache/app-text/poppler-21.01.0
-2101231224 metadata/md5-cache/app-text/poppler-9999
 2101231224 metadata/md5-cache/app-text/ps2eps-1.68
 2101231224 metadata/md5-cache/app-text/psiconv-0.8.3-r1
 2101231224 metadata/md5-cache/app-text/pspdftool-0.03
@@ -34225,7 +33995,6 @@
 2101251739 metadata/md5-cache/app-text/scdoc-1.11.1
 2101260039 metadata/md5-cache/app-text/xapian-omega-1.4.18
 2101271839 metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r5
-2101312309 metadata/md5-cache/app-text/Manifest.gz
 2101310343 metadata/md5-cache/app-text/asciidoc-9.0.2
 2101310343 metadata/md5-cache/app-text/asciidoc-9.0.4
 2101310343 metadata/md5-cache/app-text/atril-1.24.0-r2
@@ -34238,7 +34007,6 @@
 2101310343 metadata/md5-cache/app-text/cherrytree-9999
 2101310343 metadata/md5-cache/app-text/cmark-0.29.0
 2101310343 metadata/md5-cache/app-text/dblatex-0.3.11
-2101310343 metadata/md5-cache/app-text/dblatex-0.3.11-r1
 2101312209 metadata/md5-cache/app-text/evince-3.36.9
 2101310343 metadata/md5-cache/app-text/foliate-2.4.2-r1
 2101310343 metadata/md5-cache/app-text/foliate-2.5.0
@@ -34315,6 +34083,11 @@
 2101310343 metadata/md5-cache/app-text/zathura-pdf-poppler-9999
 2101310343 metadata/md5-cache/app-text/zathura-ps-0.2.6
 2101310343 metadata/md5-cache/app-text/zathura-ps-9999
+2102020439 metadata/md5-cache/app-text/Manifest.gz
+2102012109 metadata/md5-cache/app-text/dblatex-0.3.11-r1
+2102020109 metadata/md5-cache/app-text/libnumbertext-1.0.7
+2102020439 metadata/md5-cache/app-text/poppler-21.02.0
+2102020439 metadata/md5-cache/app-text/poppler-9999
 2012281255 metadata/md5-cache/app-vim/ackvim-1.0.9-r1
 2012281255 metadata/md5-cache/app-vim/airline-0.11
 2012281255 metadata/md5-cache/app-vim/airline-9999
@@ -35048,7 +34821,6 @@
 2012281255 metadata/md5-cache/dev-db/pgtap-1.1.0
 2012281255 metadata/md5-cache/dev-db/plr-8.3.0.17
 2012281255 metadata/md5-cache/dev-db/plr-8.4.1
-2012281255 metadata/md5-cache/dev-db/sqlcl-bin-20.3.0.274.1916
 2012281255 metadata/md5-cache/dev-db/sqldeveloper-20.2.0.175.1842
 2012311940 metadata/md5-cache/dev-db/m17n-db-1.7.0
 2012310139 metadata/md5-cache/dev-db/phppgadmin-7.13.0
@@ -35212,7 +34984,6 @@
 2101241539 metadata/md5-cache/dev-db/pgrouting-3.1.1
 2101240709 metadata/md5-cache/dev-db/redis-6.0.9-r100
 2101241539 metadata/md5-cache/dev-db/slony1-2.2.10
-2101310343 metadata/md5-cache/dev-db/Manifest.gz
 2101310343 metadata/md5-cache/dev-db/barman-2.10
 2101310343 metadata/md5-cache/dev-db/kdb-3.2.0
 2101310343 metadata/md5-cache/dev-db/mongodb-4.2.11
@@ -35236,6 +35007,8 @@
 2101310343 metadata/md5-cache/dev-db/postgresql-9.6.20
 2101310343 metadata/md5-cache/dev-db/postgresql-9999
 2101310343 metadata/md5-cache/dev-db/sadisplay-0.4.9
+2102011639 metadata/md5-cache/dev-db/Manifest.gz
+2102011639 metadata/md5-cache/dev-db/sqlcl-bin-20.4.1.351.1718
 2005162339 metadata/md5-cache/dev-dotnet/ndesk-dbus-0.6.1a
 2005162339 metadata/md5-cache/dev-dotnet/ndesk-dbus-glib-0.4.1
 2101231224 metadata/md5-cache/dev-dotnet/Manifest.gz
@@ -38093,9 +37866,7 @@
 2101231224 metadata/md5-cache/dev-libs/zookeeper-c-3.4.10
 2101231224 metadata/md5-cache/dev-libs/zthread-2.3.2-r4
 2101241439 metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4
-2101240309 metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r4
 2101240309 metadata/md5-cache/dev-libs/ding-libs-0.6.1-r1
-2101240309 metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140719-r1
 2101241509 metadata/md5-cache/dev-libs/libconfig-1.7.2
 2101240209 metadata/md5-cache/dev-libs/libqtxdg-3.6.0
 2101250239 metadata/md5-cache/dev-libs/libyaml-0.2.5
@@ -38150,7 +37921,6 @@
 2101310343 metadata/md5-cache/dev-libs/gobject-introspection-1.64.1-r1
 2101310343 metadata/md5-cache/dev-libs/gobject-introspection-1.66.1
 2101310343 metadata/md5-cache/dev-libs/gom-0.4
-2101310343 metadata/md5-cache/dev-libs/granite-5.2.5-r1
 2101310343 metadata/md5-cache/dev-libs/hyperscan-5.3.0
 2101310343 metadata/md5-cache/dev-libs/hyperscan-5.4.0
 2101310343 metadata/md5-cache/dev-libs/icu-68.2
@@ -38208,7 +37978,6 @@
 2101310343 metadata/md5-cache/dev-libs/libmanette-0.2.5
 2101310343 metadata/md5-cache/dev-libs/libnl-3.5.0
 2101310343 metadata/md5-cache/dev-libs/libnl-99999999
-2101300009 metadata/md5-cache/dev-libs/liboil-0.3.17-r3
 2101310343 metadata/md5-cache/dev-libs/liborcus-0.15.4
 2101310343 metadata/md5-cache/dev-libs/liborcus-9999
 2101310343 metadata/md5-cache/dev-libs/libpeas-1.26.0
@@ -38271,7 +38040,6 @@
 2101310343 metadata/md5-cache/dev-libs/stfl-0.24-r3
 2101310343 metadata/md5-cache/dev-libs/template-glib-3.34.0
 2101310343 metadata/md5-cache/dev-libs/totem-pl-parser-3.26.5
-2101310343 metadata/md5-cache/dev-libs/udis86-1.7.2-r1
 2101310343 metadata/md5-cache/dev-libs/vc-intrinsics-0_p20200904
 2101310343 metadata/md5-cache/dev-libs/voikko-fi-2.4
 2101310343 metadata/md5-cache/dev-libs/volume_key-0.3.12-r3
@@ -38288,8 +38056,15 @@
 2101310343 metadata/md5-cache/dev-libs/zziplib-0.13.71-r2
 2101310343 metadata/md5-cache/dev-libs/zziplib-0.13.71_p20201021
 2101310343 metadata/md5-cache/dev-libs/zziplib-0.13.72
-2102010809 metadata/md5-cache/dev-libs/Manifest.gz
 2102010809 metadata/md5-cache/dev-libs/boost-1.74.0-r2
+2102011909 metadata/md5-cache/dev-libs/Manifest.gz
+2102011839 metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r4
+2102011639 metadata/md5-cache/dev-libs/granite-5.2.5-r1
+2102011639 metadata/md5-cache/dev-libs/granite-5.5.0
+2102011839 metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140719-r1
+2102011909 metadata/md5-cache/dev-libs/libevdev-1.11.0
+2102011839 metadata/md5-cache/dev-libs/liboil-0.3.17-r3
+2102011839 metadata/md5-cache/dev-libs/udis86-1.7.2-r1
 2012231444 metadata/md5-cache/dev-lisp/hyperspec-7.0-r1
 2101231224 metadata/md5-cache/dev-lisp/abcl-1.5.0
 2101231224 metadata/md5-cache/dev-lisp/alexandria-20171029
@@ -38574,7 +38349,6 @@
 2101252009 metadata/md5-cache/dev-ml/ocaml-dispatch-0.4.0
 2101252009 metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1
 2101252009 metadata/md5-cache/dev-ml/ocaml-expect-0.0.5
-2101252009 metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r2
 2101252009 metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
 2101260109 metadata/md5-cache/dev-ml/ocaml-ipaddr-2.8.0
 2101252009 metadata/md5-cache/dev-ml/ocaml-magic-mime-1.0.0
@@ -38672,11 +38446,9 @@
 2101262109 metadata/md5-cache/dev-ml/camlp4-4.11_p1
 2101262109 metadata/md5-cache/dev-ml/cudf-0.9
 2101262039 metadata/md5-cache/dev-ml/dose3-5.0.1-r1
-2101262109 metadata/md5-cache/dev-ml/dune-2.8.2
 2101262139 metadata/md5-cache/dev-ml/findlib-1.8.1-r2
 2101270639 metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2
 2101270639 metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2
-2101270639 metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2
 2101262109 metadata/md5-cache/dev-ml/ocamlbuild-0.14.0-r1
 2101270009 metadata/md5-cache/dev-ml/ocamlweb-1.41
 2101271239 metadata/md5-cache/dev-ml/async-0.14.0
@@ -38710,7 +38482,6 @@
 2101291039 metadata/md5-cache/dev-ml/oasis-0.4.10
 2101291109 metadata/md5-cache/dev-ml/ocaml-data-notation-0.0.11-r1
 2101291039 metadata/md5-cache/dev-ml/ocamlify-0.0.2
-2101311939 metadata/md5-cache/dev-ml/Manifest.gz
 2101301939 metadata/md5-cache/dev-ml/dune-2.7.1
 2101300209 metadata/md5-cache/dev-ml/dune-private-libs-2.8.2-r1
 2101310343 metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1
@@ -38725,6 +38496,11 @@
 2101300039 metadata/md5-cache/dev-ml/logs-0.6.3
 2101310209 metadata/md5-cache/dev-ml/logs-0.7.0
 2101311939 metadata/md5-cache/dev-ml/merlin-extend-0.3
+2102020739 metadata/md5-cache/dev-ml/Manifest.gz
+2102020039 metadata/md5-cache/dev-ml/dune-2.8.2
+2102020739 metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r2
+2102020739 metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2
+2102012109 metadata/md5-cache/dev-ml/ocaml-ssl-0.5.10
 1910170740 metadata/md5-cache/dev-perl/Apache-CGI-Builder-1.300.0-r2
 1910170740 metadata/md5-cache/dev-perl/Apache2-AuthenNTLM-0.20.0-r2
 1910170740 metadata/md5-cache/dev-perl/Bio-Das-1.170.0-r2
@@ -40808,13 +40584,11 @@
 2002112051 metadata/md5-cache/dev-php/PEAR-Text_Highlighter-0.7.3-r1
 2002112051 metadata/md5-cache/dev-php/xdebug-handler-1.3.0
 2002112051 metadata/md5-cache/dev-php/xdebug-handler-1.3.1
-2002141839 metadata/md5-cache/dev-php/composer-1.9.3
 2002230040 metadata/md5-cache/dev-php/PEAR-MIME_Type-1.4.1
 2002230040 metadata/md5-cache/dev-php/twig-1.40.1-r1
 2002230040 metadata/md5-cache/dev-php/twig-1.42.3
 2002230040 metadata/md5-cache/dev-php/twig-1.42.3-r1
 2003200109 metadata/md5-cache/dev-php/PHPMailer-5.2.28
-2003200109 metadata/md5-cache/dev-php/composer-1.10.1
 2003200109 metadata/md5-cache/dev-php/phar-utils-1.1.0
 2003200109 metadata/md5-cache/dev-php/semver-1.5.1
 2003200109 metadata/md5-cache/dev-php/spdx-licenses-1.5.3
@@ -40837,23 +40611,17 @@
 2003261841 metadata/md5-cache/dev-php/theseer-tokenizer-1.1.0
 2003261841 metadata/md5-cache/dev-php/theseer-tokenizer-1.1.3
 2003261841 metadata/md5-cache/dev-php/webmozart-assert-1.4.0
-2004211439 metadata/md5-cache/dev-php/composer-1.10.5
 2004300039 metadata/md5-cache/dev-php/psr-log-1.1.3
-2005191309 metadata/md5-cache/dev-php/composer-1.10.6
 2006041239 metadata/md5-cache/dev-php/PHP_CodeCoverage-7.0.10-r1
 2006041239 metadata/md5-cache/dev-php/libchart-1.3
 2006041239 metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3-r1
 2006101709 metadata/md5-cache/dev-php/PHPMailer-6.1.6
 2006150239 metadata/md5-cache/dev-php/PEAR-Log-1.13.2
-2006150239 metadata/md5-cache/dev-php/composer-1.10.7
 2006150239 metadata/md5-cache/dev-php/json-schema-5.2.10
 2006260109 metadata/md5-cache/dev-php/phing-2.16.3
 2006260109 metadata/md5-cache/dev-php/phpmd-2.8.2
-2006291839 metadata/md5-cache/dev-php/composer-1.10.8
-2007262139 metadata/md5-cache/dev-php/composer-1.10.9
 2008061739 metadata/md5-cache/dev-php/PHPMailer-6.1.7
 2008061739 metadata/md5-cache/dev-php/adodb-5.20.18
-2008061739 metadata/md5-cache/dev-php/composer-1.10.10
 2008190209 metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.3
 2008190209 metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.4
 2008190409 metadata/md5-cache/dev-php/phptal-1.3.1
@@ -40863,7 +40631,6 @@
 2008190139 metadata/md5-cache/dev-php/symfony-filesystem-3.4.36
 2008190139 metadata/md5-cache/dev-php/symfony-finder-3.4.38
 2008270009 metadata/md5-cache/dev-php/PHP_CodeSniffer-3.5.6
-2009140239 metadata/md5-cache/dev-php/composer-1.10.13
 2009140239 metadata/md5-cache/dev-php/phar-utils-1.1.1
 2009140239 metadata/md5-cache/dev-php/semver-1.7.0
 2009140239 metadata/md5-cache/dev-php/spdx-licenses-1.5.4
@@ -41077,11 +40844,6 @@
 2101231224 metadata/md5-cache/dev-php/pecl-geoip-1.1.1-r5
 2101231224 metadata/md5-cache/dev-php/pecl-gnupg-1.4.0-r2
 2101231224 metadata/md5-cache/dev-php/pecl-http-3.2.1
-2101231224 metadata/md5-cache/dev-php/pecl-http-3.2.3
-2101231224 metadata/md5-cache/dev-php/pecl-http-3.2.3-r1
-2101231224 metadata/md5-cache/dev-php/pecl-http-3.2.4
-2101231224 metadata/md5-cache/dev-php/pecl-http-4.0.0
-2101231224 metadata/md5-cache/dev-php/pecl-http-4.0.0_beta1
 2101231224 metadata/md5-cache/dev-php/pecl-imagick-3.4.4
 2101231224 metadata/md5-cache/dev-php/pecl-lzf-1.6.8-r1
 2101231224 metadata/md5-cache/dev-php/pecl-mcrypt-1.0.3
@@ -41138,8 +40900,25 @@
 2101241539 metadata/md5-cache/dev-php/pecl-event-2.5.7
 2101252039 metadata/md5-cache/dev-php/pecl-apcu-5.1.19
 2101260209 metadata/md5-cache/dev-php/pecl-mailparse-3.1.1
-2101281939 metadata/md5-cache/dev-php/Manifest.gz
 2101281939 metadata/md5-cache/dev-php/pecl-pam-1.0.3-r3
+2102020439 metadata/md5-cache/dev-php/Manifest.gz
+2102020439 metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.10
+2102020439 metadata/md5-cache/dev-php/PHP_CodeSniffer-3.5.8
+2102020109 metadata/md5-cache/dev-php/adodb-5.20.20
+2102012009 metadata/md5-cache/dev-php/composer-1.10.20
+2102012239 metadata/md5-cache/dev-php/composer-2.0.9
+2102020439 metadata/md5-cache/dev-php/doctrine-instantiator-1.4.0
+2102020439 metadata/md5-cache/dev-php/jsonlint-1.8.3
+2102011909 metadata/md5-cache/dev-php/pecl-http-3.2.4
+2102011909 metadata/md5-cache/dev-php/pecl-http-4.0.0
+2102020439 metadata/md5-cache/dev-php/pecl-timezonedb-2021.1
+2102012009 metadata/md5-cache/dev-php/phar-io-manifest-2.0.1
+2102012009 metadata/md5-cache/dev-php/phar-io-version-3.0.4
+2102012009 metadata/md5-cache/dev-php/phpunit-8.5.14
+2102012239 metadata/md5-cache/dev-php/reactphp-promise-2.8.0
+2102011639 metadata/md5-cache/dev-php/scrypt-1.4.2
+2102011639 metadata/md5-cache/dev-php/scrypt-9999
+2102012239 metadata/md5-cache/dev-php/semver-3.2.4
 2011221509 metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.3_p37
 2012281255 metadata/md5-cache/dev-python/nltk-data-20200312-r1
 2101051409 metadata/md5-cache/dev-python/python-docs-2.7.18
@@ -41708,8 +41487,6 @@
 2101310343 metadata/md5-cache/dev-python/gsd-1.5.3-r1
 2101310343 metadata/md5-cache/dev-python/gsd-2.4.0
 2101310343 metadata/md5-cache/dev-python/gst-python-1.16.2
-2101310343 metadata/md5-cache/dev-python/guessit-3.1.1
-2101310343 metadata/md5-cache/dev-python/guessit-3.2.0
 2101310343 metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11-r1
 2101310343 metadata/md5-cache/dev-python/h11-0.11.0
 2101310343 metadata/md5-cache/dev-python/h11-0.12.0
@@ -41835,8 +41612,6 @@
 2101310343 metadata/md5-cache/dev-python/jinja2-time-0.2.0
 2101310343 metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
 2101310343 metadata/md5-cache/dev-python/jmespath-0.10.0
-2101310343 metadata/md5-cache/dev-python/joblib-0.17.0
-2101310343 metadata/md5-cache/dev-python/joblib-1.0.0
 2101310343 metadata/md5-cache/dev-python/josepy-1.4.0
 2101310343 metadata/md5-cache/dev-python/josepy-1.5.0
 2101310343 metadata/md5-cache/dev-python/josepy-1.6.0
@@ -42526,8 +42301,6 @@
 2101310343 metadata/md5-cache/dev-python/pytest-timeout-1.4.2-r1
 2101310343 metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r1
 2101310343 metadata/md5-cache/dev-python/pytest-xdist-1.34.0-r1
-2101310343 metadata/md5-cache/dev-python/pytest-xdist-2.2.0
-2101310343 metadata/md5-cache/dev-python/pytest-xdist-2.2.0-r1
 2101310343 metadata/md5-cache/dev-python/pytest-xprocess-0.17.0
 2101310343 metadata/md5-cache/dev-python/pytest-xvfb-2.0.0
 2101310343 metadata/md5-cache/dev-python/python-augeas-1.1.0
@@ -43033,7 +42806,6 @@
 2101310343 metadata/md5-cache/dev-python/urllib3-1.26.2
 2101310343 metadata/md5-cache/dev-python/urllib3-1.26.2-r1
 2101310343 metadata/md5-cache/dev-python/urllib3-1.26.2-r2
-2101310343 metadata/md5-cache/dev-python/urllib3-1.26.2-r3
 2101310343 metadata/md5-cache/dev-python/urllib3-1.26.3
 2101310343 metadata/md5-cache/dev-python/urwid-2.1.1
 2101310343 metadata/md5-cache/dev-python/urwidtrees-1.0.3
@@ -43154,7 +42926,6 @@
 2101310343 metadata/md5-cache/dev-python/zstandard-0.15.1
 2101310343 metadata/md5-cache/dev-python/zstd-1.4.5.1
 2101310343 metadata/md5-cache/dev-python/zxcvbn-4.4.28
-2102011209 metadata/md5-cache/dev-python/Manifest.gz
 2102011209 metadata/md5-cache/dev-python/cftime-1.4.0
 2102011209 metadata/md5-cache/dev-python/cmd2-1.5.0
 2102011209 metadata/md5-cache/dev-python/flask-paginate-0.8.1
@@ -43165,6 +42936,17 @@
 2102010809 metadata/md5-cache/dev-python/python-dotenv-0.15.0
 2102011209 metadata/md5-cache/dev-python/pytz-2021.1
 2102010109 metadata/md5-cache/dev-python/snakeoil-0.9.1
+2102020209 metadata/md5-cache/dev-python/Manifest.gz
+2102012009 metadata/md5-cache/dev-python/django-2.2.18
+2102012009 metadata/md5-cache/dev-python/django-3.0.12
+2102012009 metadata/md5-cache/dev-python/django-3.1.6
+2102011839 metadata/md5-cache/dev-python/guessit-3.2.0
+2102011839 metadata/md5-cache/dev-python/joblib-1.0.0
+2102011839 metadata/md5-cache/dev-python/pytest-xdist-2.2.0-r1
+2102012009 metadata/md5-cache/dev-python/setuptools-53.0.0
+2102020209 metadata/md5-cache/dev-python/sqlalchemy-1.3.23
+2102011839 metadata/md5-cache/dev-python/urllib3-1.26.2-r3
+2102012009 metadata/md5-cache/dev-python/virtualenv-20.4.2
 2101101239 metadata/md5-cache/dev-qt/qt-docs-5.15.2_p202011130614
 2101231224 metadata/md5-cache/dev-qt/assistant-5.15.2
 2101231224 metadata/md5-cache/dev-qt/designer-5.15.2
@@ -44815,7 +44597,6 @@
 2101231224 metadata/md5-cache/dev-ruby/necromancer-0.7.0
 2101231224 metadata/md5-cache/dev-ruby/nenv-0.3.0
 2101231224 metadata/md5-cache/dev-ruby/neovim-ruby-client-0.8.1-r1
-2101231224 metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
 2101231224 metadata/md5-cache/dev-ruby/net-http-persistent-3.0.0
 2101231224 metadata/md5-cache/dev-ruby/net-http-persistent-3.1.0
 2101231224 metadata/md5-cache/dev-ruby/net-http-persistent-4.0.0
@@ -45491,7 +45272,6 @@
 2101291109 metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1
 2101291209 metadata/md5-cache/dev-ruby/rubygems-3.1.6
 2101291209 metadata/md5-cache/dev-ruby/rubygems-3.2.7
-2101311309 metadata/md5-cache/dev-ruby/Manifest.gz
 2101301009 metadata/md5-cache/dev-ruby/capybara-3.35.3
 2101311309 metadata/md5-cache/dev-ruby/rbs-1.0.4
 2101310343 metadata/md5-cache/dev-ruby/rbst-0.6.5
@@ -45501,6 +45281,13 @@
 2101311039 metadata/md5-cache/dev-ruby/terminal-table-3.0.0
 2101311039 metadata/md5-cache/dev-ruby/test-unit-3.4.0
 2101311039 metadata/md5-cache/dev-ruby/unicode-display_width-2.0.0
+2102020909 metadata/md5-cache/dev-ruby/Manifest.gz
+2102020909 metadata/md5-cache/dev-ruby/i18n-1.8.8
+2102020909 metadata/md5-cache/dev-ruby/jbuilder-2.11.2
+2102020909 metadata/md5-cache/dev-ruby/mechanize-2.7.7
+2102020909 metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
+2102020909 metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1
+2102020909 metadata/md5-cache/dev-ruby/rake-13.0.3-r1
 1807201639 metadata/md5-cache/dev-scheme/gauche-gl-0.6
 1807201639 metadata/md5-cache/dev-scheme/gauche-mecab-1.0.2
 1802122238 metadata/md5-cache/dev-scheme/goosh-1.3-r1
@@ -45910,8 +45697,6 @@
 2101231224 metadata/md5-cache/dev-util/cargo-ebuild-0.3.0
 2101231224 metadata/md5-cache/dev-util/cargo-ebuild-0.3.1
 2101231224 metadata/md5-cache/dev-util/cargo-license-0.3.0
-2101231224 metadata/md5-cache/dev-util/cbindgen-0.15.0
-2101231224 metadata/md5-cache/dev-util/cbindgen-0.16.0
 2101231224 metadata/md5-cache/dev-util/ccache-3.7.12
 2101231224 metadata/md5-cache/dev-util/ccache-4.1
 2101231224 metadata/md5-cache/dev-util/cccc-3.1.5-r1
@@ -45928,7 +45713,6 @@
 2101231224 metadata/md5-cache/dev-util/clazy-1.9
 2101231224 metadata/md5-cache/dev-util/cmake-3.13.5
 2101231224 metadata/md5-cache/dev-util/cmake-3.17.4-r1
-2101232009 metadata/md5-cache/dev-util/cmake-3.18.5
 2101231224 metadata/md5-cache/dev-util/cmake-fedora-2.7.1
 2101231224 metadata/md5-cache/dev-util/cmocka-1.1.5
 2101231224 metadata/md5-cache/dev-util/codeblocks-17.12-r303
@@ -46351,7 +46135,6 @@
 2101310343 metadata/md5-cache/dev-util/lldb-12.0.0_rc1
 2101310343 metadata/md5-cache/dev-util/lldb-13.0.0.9999
 2101310343 metadata/md5-cache/dev-util/lldb-9.0.1-r1
-2101301309 metadata/md5-cache/dev-util/lttng-ust-2.12.0
 2101310343 metadata/md5-cache/dev-util/meld-3.20.2-r1
 2101310343 metadata/md5-cache/dev-util/meson-0.55.3
 2101310343 metadata/md5-cache/dev-util/meson-0.56.2
@@ -46423,9 +46206,12 @@
 2101310343 metadata/md5-cache/dev-util/wstool-9999
 2101310343 metadata/md5-cache/dev-util/xdelta-3.1.0
 2101310343 metadata/md5-cache/dev-util/ydiff-1.2
-2102011039 metadata/md5-cache/dev-util/Manifest.gz
 2102011039 metadata/md5-cache/dev-util/cargo-c-0.7.2
 2102010539 metadata/md5-cache/dev-util/pkgcheck-0.8.1
+2102011839 metadata/md5-cache/dev-util/Manifest.gz
+2102011809 metadata/md5-cache/dev-util/cbindgen-0.16.0
+2102011839 metadata/md5-cache/dev-util/cmake-3.18.5
+2102011639 metadata/md5-cache/dev-util/lttng-ust-2.12.0
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 1809152309 metadata/md5-cache/dev-vcs/cvsutils-0.2.5-r1
 1807302309 metadata/md5-cache/dev-vcs/easygit-1.7.5.2
@@ -47756,8 +47542,8 @@
 2101310343 metadata/md5-cache/gui-libs/wlroots-0.12.0
 2101310343 metadata/md5-cache/gui-libs/wlroots-9999
 2101310343 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-9999
-2102010439 metadata/md5-cache/gui-libs/Manifest.gz
-2102010439 metadata/md5-cache/gui-libs/display-manager-init-1.0
+2102020209 metadata/md5-cache/gui-libs/Manifest.gz
+2102020209 metadata/md5-cache/gui-libs/display-manager-init-1.0
 2101231224 metadata/md5-cache/gui-wm/hikari-2.2.2-r1
 2101310343 metadata/md5-cache/gui-wm/Manifest.gz
 2101310343 metadata/md5-cache/gui-wm/sway-1.5.1-r1
@@ -48278,7 +48064,6 @@
 2101231224 metadata/md5-cache/kde-frameworks/kcoreaddons-5.78.0
 2101231224 metadata/md5-cache/kde-frameworks/kcrash-5.77.0
 2101231224 metadata/md5-cache/kde-frameworks/kcrash-5.78.0
-2101231224 metadata/md5-cache/kde-frameworks/kdav-5.77.0-r1
 2101231224 metadata/md5-cache/kde-frameworks/kdav-5.78.0
 2101231224 metadata/md5-cache/kde-frameworks/kdbusaddons-5.77.0
 2101231224 metadata/md5-cache/kde-frameworks/kdbusaddons-5.78.0
@@ -48391,7 +48176,6 @@
 2101241839 metadata/md5-cache/kde-frameworks/purpose-5.78.0-r1
 2101242239 metadata/md5-cache/kde-frameworks/syntax-highlighting-5.77.0-r3
 2101260309 metadata/md5-cache/kde-frameworks/kcompletion-5.78.0-r1
-2101310343 metadata/md5-cache/kde-frameworks/Manifest.gz
 2101310343 metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.77.0
 2101310343 metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.78.0
 2101310343 metadata/md5-cache/kde-frameworks/kapidox-5.77.0
@@ -48402,6 +48186,8 @@
 2101310343 metadata/md5-cache/kde-frameworks/kfilemetadata-5.78.0
 2101310343 metadata/md5-cache/kde-frameworks/ki18n-5.77.0
 2101310343 metadata/md5-cache/kde-frameworks/ki18n-5.78.0
+2102011939 metadata/md5-cache/kde-frameworks/Manifest.gz
+2102011939 metadata/md5-cache/kde-frameworks/kdav-5.77.0-r1
 2101231224 metadata/md5-cache/kde-misc/basket-2.49b
 2101231224 metadata/md5-cache/kde-misc/colord-kde-0.5.0-r2
 2101231224 metadata/md5-cache/kde-misc/kdeconnect-20.08.3
@@ -49070,7 +48856,6 @@
 2101231224 metadata/md5-cache/media-gfx/aewan-1.0.01-r1
 2101231224 metadata/md5-cache/media-gfx/ahoviewer-1.6.5-r2
 2101231224 metadata/md5-cache/media-gfx/alembic-1.7.12
-2101231224 metadata/md5-cache/media-gfx/alembic-1.7.16
 2101231224 metadata/md5-cache/media-gfx/apng2gif-1.8
 2101231224 metadata/md5-cache/media-gfx/apngasm-2.91
 2101231224 metadata/md5-cache/media-gfx/apngdis-2.9
@@ -49152,7 +48937,6 @@
 2101231224 metadata/md5-cache/media-gfx/icc-examin-0.56_p20171007
 2101231224 metadata/md5-cache/media-gfx/icc-examin-9999
 2101231224 metadata/md5-cache/media-gfx/icoutils-0.32.3
-2101231839 metadata/md5-cache/media-gfx/imagemagick-9999
 2101231224 metadata/md5-cache/media-gfx/imv-4.0.1-r2
 2101231224 metadata/md5-cache/media-gfx/imv-4.1.0-r1
 2101231224 metadata/md5-cache/media-gfx/iscan-2.30.4.2-r1
@@ -49269,12 +49053,7 @@
 2101240209 metadata/md5-cache/media-gfx/lximage-qt-0.16.0
 2101232139 metadata/md5-cache/media-gfx/xpaint-2.10.2-r1
 2101270739 metadata/md5-cache/media-gfx/tuxpaint-0.9.24
-2101271839 metadata/md5-cache/media-gfx/imagemagick-6.9.11.58
-2101271839 metadata/md5-cache/media-gfx/imagemagick-6.9.11.60
-2101271839 metadata/md5-cache/media-gfx/imagemagick-7.0.10.58
-2101271839 metadata/md5-cache/media-gfx/imagemagick-7.0.10.60
 2101281609 metadata/md5-cache/media-gfx/valentina-0.6.1-r1
-2101311939 metadata/md5-cache/media-gfx/Manifest.gz
 2101310343 metadata/md5-cache/media-gfx/asymptote-2.65
 2101310343 metadata/md5-cache/media-gfx/asymptote-2.67
 2101310343 metadata/md5-cache/media-gfx/asymptote-2.68
@@ -49354,6 +49133,14 @@
 2101310343 metadata/md5-cache/media-gfx/yafaray-3.4.1
 2101310343 metadata/md5-cache/media-gfx/zbar-0.23-r1
 2101310343 metadata/md5-cache/media-gfx/zbar-0.23.1
+2102020139 metadata/md5-cache/media-gfx/Manifest.gz
+2102011639 metadata/md5-cache/media-gfx/alembic-1.7.16
+2102011809 metadata/md5-cache/media-gfx/imagemagick-6.9.11.60
+2102011809 metadata/md5-cache/media-gfx/imagemagick-6.9.11.61
+2102011809 metadata/md5-cache/media-gfx/imagemagick-7.0.10.60
+2102011809 metadata/md5-cache/media-gfx/imagemagick-7.0.10.61
+2102011809 metadata/md5-cache/media-gfx/imagemagick-9999
+2102020139 metadata/md5-cache/media-gfx/pngcheck-3.0.2
 1802221208 metadata/md5-cache/media-libs/blib-1.1.7-r2
 1902171239 metadata/md5-cache/media-libs/libggimisc-2.2.2-r1
 1805290208 metadata/md5-cache/media-libs/libpqstego-0.0.1
@@ -49541,7 +49328,6 @@
 2101231224 metadata/md5-cache/media-libs/libavif-0.8.3
 2101231224 metadata/md5-cache/media-libs/libavif-0.8.4
 2101231224 metadata/md5-cache/media-libs/libavif-9999
-2101231224 metadata/md5-cache/media-libs/libbdplus-0.1.2
 2101231224 metadata/md5-cache/media-libs/libbluray-1.2.0
 2101231224 metadata/md5-cache/media-libs/libbluray-1.2.1
 2101231224 metadata/md5-cache/media-libs/libbluray-9999
@@ -49557,7 +49343,6 @@
 2101231224 metadata/md5-cache/media-libs/libdca-0.0.7
 2101231224 metadata/md5-cache/media-libs/libde265-1.0.3
 2101231224 metadata/md5-cache/media-libs/libde265-1.0.5
-2101231224 metadata/md5-cache/media-libs/libde265-1.0.8
 2101231224 metadata/md5-cache/media-libs/libde265-9999
 2101231224 metadata/md5-cache/media-libs/libdv-1.0.0-r4
 2101231224 metadata/md5-cache/media-libs/libdvd-audio-1.0.0
@@ -49591,7 +49376,6 @@
 2101231224 metadata/md5-cache/media-libs/libid3tag-0.15.1b-r4
 2101231224 metadata/md5-cache/media-libs/libiec61883-1.2.0-r1
 2101231224 metadata/md5-cache/media-libs/libilbc-2.0.2
-2101231224 metadata/md5-cache/media-libs/libilbc-3.0.4
 2101231224 metadata/md5-cache/media-libs/libilbc-9999
 2101231224 metadata/md5-cache/media-libs/libirman-0.4.5
 2101231224 metadata/md5-cache/media-libs/libjpeg-turbo-1.5.3-r4
@@ -49620,7 +49404,6 @@
 2101231224 metadata/md5-cache/media-libs/libmpeg3-1.8-r1
 2101231224 metadata/md5-cache/media-libs/libmpris2client-0.1.0-r1
 2101231224 metadata/md5-cache/media-libs/libmtp-1.1.17
-2101231224 metadata/md5-cache/media-libs/libmtp-1.1.18
 2101231224 metadata/md5-cache/media-libs/libmtp-9999
 2101231224 metadata/md5-cache/media-libs/libmygpo-qt-1.1.0
 2101231224 metadata/md5-cache/media-libs/libmygpo-qt-9999
@@ -49636,7 +49419,6 @@
 2101231224 metadata/md5-cache/media-libs/libopenglrecorder-0.1.0
 2101231224 metadata/md5-cache/media-libs/libopenmpt-0.5.4
 2101231224 metadata/md5-cache/media-libs/libopenraw-0.1.2
-2101231224 metadata/md5-cache/media-libs/libopenraw-0.1.3
 2101231224 metadata/md5-cache/media-libs/libopenshot-audio-0.1.9_pre20190502
 2101231224 metadata/md5-cache/media-libs/libopenshot-audio-0.2.0
 2101231224 metadata/md5-cache/media-libs/libpagemaker-9999
@@ -49704,7 +49486,6 @@
 2101231224 metadata/md5-cache/media-libs/nv-codec-headers-9.0.18.1
 2101231224 metadata/md5-cache/media-libs/nv-codec-headers-9.1.23.1
 2101231224 metadata/md5-cache/media-libs/openal-1.20.1
-2101231224 metadata/md5-cache/media-libs/openal-1.21.0
 2101231224 metadata/md5-cache/media-libs/opencollada-1.6.63-r1
 2101231224 metadata/md5-cache/media-libs/opencollada-1.6.68
 2101231224 metadata/md5-cache/media-libs/opencore-amr-0.1.3-r1
@@ -49817,7 +49598,6 @@
 2101231224 metadata/md5-cache/media-libs/zvbi-0.2.35-r1
 2101231224 metadata/md5-cache/media-libs/zxing-cpp-1.1.1
 2101241539 metadata/md5-cache/media-libs/dumb-2.0.3
-2101240039 metadata/md5-cache/media-libs/gavl-1.4.0-r2
 2101240510 metadata/md5-cache/media-libs/ilmbase-2.5.4
 2101250039 metadata/md5-cache/media-libs/jbigkit-2.1
 2101240309 metadata/md5-cache/media-libs/libbdplus-9999
@@ -49875,24 +49655,19 @@
 2101310343 metadata/md5-cache/media-libs/jbig2dec-0.18
 2101310343 metadata/md5-cache/media-libs/jbig2dec-0.19
 2101310343 metadata/md5-cache/media-libs/lensfun-0.3.2-r1
-2101301739 metadata/md5-cache/media-libs/libbdplus-0.1.2-r1
 2101310343 metadata/md5-cache/media-libs/libchamplain-0.12.20
 2101312209 metadata/md5-cache/media-libs/libdmtx-0.7.5
 2101311039 metadata/md5-cache/media-libs/libdvdcss-1.4.2-r1
 2101310343 metadata/md5-cache/media-libs/libepoxy-1.5.4
 2101310343 metadata/md5-cache/media-libs/libepoxy-1.5.5
 2101310343 metadata/md5-cache/media-libs/libepoxy-9999
-2101300009 metadata/md5-cache/media-libs/libfame-0.9.1-r3
 2101310343 metadata/md5-cache/media-libs/libffado-2.4.4-r1
 2101310343 metadata/md5-cache/media-libs/libglvnd-1.3.2-r2
 2101310343 metadata/md5-cache/media-libs/libglvnd-9999
-2101300009 metadata/md5-cache/media-libs/libiec61883-1.2.0-r2
 2101310343 metadata/md5-cache/media-libs/libinsane-1.0.7
 2101310343 metadata/md5-cache/media-libs/libinsane-1.0.8
 2101310343 metadata/md5-cache/media-libs/libinsane-1.0.9
 2101310343 metadata/md5-cache/media-libs/libiptcdata-1.0.5
-2101300009 metadata/md5-cache/media-libs/libmms-0.6.4-r1
-2101300009 metadata/md5-cache/media-libs/libmodplug-0.8.9.0-r1
 2101310343 metadata/md5-cache/media-libs/libmpdclient-2.19
 2101310343 metadata/md5-cache/media-libs/libmypaint-1.6.1
 2101310343 metadata/md5-cache/media-libs/libopenshot-0.2.4_pre20190609
@@ -49918,7 +49693,6 @@
 2101310209 metadata/md5-cache/media-libs/munt-mt32emu-2.4.2
 2101310343 metadata/md5-cache/media-libs/mutagen-1.45.1
 2101310343 metadata/md5-cache/media-libs/opencolorio-1.1.1
-2101300009 metadata/md5-cache/media-libs/opencore-amr-0.1.5-r1
 2101310343 metadata/md5-cache/media-libs/opencv-4.1.2-r3
 2101310343 metadata/md5-cache/media-libs/opencv-4.5.0
 2101310343 metadata/md5-cache/media-libs/opencv-4.5.1
@@ -49957,11 +49731,23 @@
 2101310343 metadata/md5-cache/media-libs/waffle-1.6.1-r1
 2101310343 metadata/md5-cache/media-libs/waffle-1.6.2
 2101310343 metadata/md5-cache/media-libs/waffle-9999
-2102011139 metadata/md5-cache/media-libs/Manifest.gz
 2102010809 metadata/md5-cache/media-libs/libmp3splt-0.9.2-r2
-2102011139 metadata/md5-cache/media-libs/libmpeg2-0.5.1-r3
 2102010109 metadata/md5-cache/media-libs/libshout-2.4.5
 2102010109 metadata/md5-cache/media-libs/libxmi-1.3-r1
+2102020739 metadata/md5-cache/media-libs/Manifest.gz
+2102011839 metadata/md5-cache/media-libs/gavl-1.4.0-r2
+2102011639 metadata/md5-cache/media-libs/libbdplus-0.1.2-r1
+2102011639 metadata/md5-cache/media-libs/libde265-1.0.8
+2102011839 metadata/md5-cache/media-libs/libfame-0.9.1-r3
+2102011839 metadata/md5-cache/media-libs/libiec61883-1.2.0-r2
+2102011639 metadata/md5-cache/media-libs/libilbc-3.0.4
+2102011839 metadata/md5-cache/media-libs/libmms-0.6.4-r1
+2102011839 metadata/md5-cache/media-libs/libmodplug-0.8.9.0-r1
+2102020739 metadata/md5-cache/media-libs/libmpeg2-0.5.1-r3
+2102011639 metadata/md5-cache/media-libs/libmtp-1.1.18
+2102020739 metadata/md5-cache/media-libs/libopenraw-0.1.3
+2102011639 metadata/md5-cache/media-libs/openal-1.21.0
+2102011839 metadata/md5-cache/media-libs/opencore-amr-0.1.5-r1
 1908120039 metadata/md5-cache/media-plugins/hexter-1.1.0
 1911121409 metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1-r1
 1912241539 metadata/md5-cache/media-plugins/vdr-burn-templates-0.0.3
@@ -50199,8 +49985,6 @@
 2101231224 metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.2
 2101231224 metadata/md5-cache/media-plugins/kodi-pvr-argustv-7.0.0
 2101231224 metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
-2101231224 metadata/md5-cache/media-plugins/kodi-pvr-demo-6.0.1
-2101231224 metadata/md5-cache/media-plugins/kodi-pvr-demo-7.0.0
 2101231224 metadata/md5-cache/media-plugins/kodi-pvr-demo-9999
 2101231224 metadata/md5-cache/media-plugins/kodi-pvr-dvblink-8.0.0
 2101231224 metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9.0.0
@@ -50438,7 +50222,6 @@
 2101231224 metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5
 2101231224 metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r1
 2101240109 metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.0
-2101312009 metadata/md5-cache/media-plugins/Manifest.gz
 2101310343 metadata/md5-cache/media-plugins/ams-lv2-1.2.2
 2101310343 metadata/md5-cache/media-plugins/grilo-plugins-0.3.11
 2101310343 metadata/md5-cache/media-plugins/gst-transcoder-1.14.1
@@ -50447,6 +50230,8 @@
 2101310343 metadata/md5-cache/media-plugins/mda-lv2-1.2.6
 2101310343 metadata/md5-cache/media-plugins/mythplugins-31.0-r1
 2101310343 metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1-r1
+2102011909 metadata/md5-cache/media-plugins/Manifest.gz
+2102011909 metadata/md5-cache/media-plugins/kodi-pvr-demo-7.1.0
 1703122008 metadata/md5-cache/media-radio/adifmerg-31-r1
 1908231409 metadata/md5-cache/media-radio/dxcc-20190309
 2002201639 metadata/md5-cache/media-radio/gpredict-2.2.1
@@ -50970,11 +50755,11 @@
 2101301739 metadata/md5-cache/media-sound/vmpk-0.8.0
 2101310343 metadata/md5-cache/media-sound/whipper-0.9.0
 2101310343 metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r8
-2102011309 metadata/md5-cache/media-sound/Manifest.gz
 2102010109 metadata/md5-cache/media-sound/guitarix-0.42.1
 2102010209 metadata/md5-cache/media-sound/kid3-3.8.5
-2102011139 metadata/md5-cache/media-sound/pulseaudio-13.0-r1
 2102010109 metadata/md5-cache/media-sound/qtractor-0.9.19
+2102020739 metadata/md5-cache/media-sound/Manifest.gz
+2102020739 metadata/md5-cache/media-sound/pulseaudio-13.0-r1
 1806021308 metadata/md5-cache/media-tv/ivtvplayer-0.1.3-r2
 1702282327 metadata/md5-cache/media-tv/mythtv-status-0.10.4
 1702282327 metadata/md5-cache/media-tv/shoutcast2vdr-0.0.8-r1
@@ -50998,14 +50783,13 @@
 2101231224 metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r4
 2101231224 metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r5
 2101231224 metadata/md5-cache/media-tv/v4l-utils-1.20.0
-2101310343 metadata/md5-cache/media-tv/Manifest.gz
-2101310343 metadata/md5-cache/media-tv/kodi-19.0_beta2_p20210112
-2101310343 metadata/md5-cache/media-tv/kodi-19.0_rc1
-2101310343 metadata/md5-cache/media-tv/kodi-19.9999
-2101310343 metadata/md5-cache/media-tv/kodi-9999
 2101310343 metadata/md5-cache/media-tv/mythtv-31.0-r5
 2101291709 metadata/md5-cache/media-tv/tvbrowser-bin-4.2.2
 2101310343 metadata/md5-cache/media-tv/tvnamer-2.5
+2102020009 metadata/md5-cache/media-tv/Manifest.gz
+2102020009 metadata/md5-cache/media-tv/kodi-19.0_rc1-r2
+2102020009 metadata/md5-cache/media-tv/kodi-19.9999
+2102020009 metadata/md5-cache/media-tv/kodi-9999
 1702282327 metadata/md5-cache/media-video/binkplayer-1.99w
 1810060109 metadata/md5-cache/media-video/blinkensim-2.7-r1
 1904012039 metadata/md5-cache/media-video/blinkenthemes-0.10-r1
@@ -51077,7 +50861,6 @@
 2101231224 metadata/md5-cache/media-video/flvstreamer-2.1c
 2101231224 metadata/md5-cache/media-video/frameworks-0.3.7-r1
 2101231224 metadata/md5-cache/media-video/gnome-video-effects-0.4.3
-2101231224 metadata/md5-cache/media-video/google2srt-0.5.6-r1
 2101231224 metadata/md5-cache/media-video/gpac-1.0.1
 2101231224 metadata/md5-cache/media-video/gpac-9999
 2101231224 metadata/md5-cache/media-video/guvcview-2.0.6-r1
@@ -51142,7 +50925,6 @@
 2101231224 metadata/md5-cache/media-video/raspberrypi-omxplayer-9999
 2101231224 metadata/md5-cache/media-video/rav1e-0.3.3
 2101231224 metadata/md5-cache/media-video/rav1e-0.3.4
-2101231224 metadata/md5-cache/media-video/rav1e-0.3.5
 2101231224 metadata/md5-cache/media-video/rav1e-0.4.0
 2101231224 metadata/md5-cache/media-video/rav1e-9999
 2101231224 metadata/md5-cache/media-video/recordmydesktop-0.3.8.1-r6
@@ -51195,7 +50977,6 @@
 2101241539 metadata/md5-cache/media-video/vdrsync-0.1.3_pre050322-r2
 2101240709 metadata/md5-cache/media-video/vlc-3.0.12.1-r100
 2101280609 metadata/md5-cache/media-video/ushare-1.1a_p20200824
-2101312239 metadata/md5-cache/media-video/Manifest.gz
 2101310343 metadata/md5-cache/media-video/aravis-0.7.2
 2101310343 metadata/md5-cache/media-video/aravis-0.8.5
 2101310343 metadata/md5-cache/media-video/aravis-9999
@@ -51236,6 +51017,9 @@
 2101310343 metadata/md5-cache/media-video/vidcutter-6.0.0-r1
 2101310343 metadata/md5-cache/media-video/vidcutter-9999
 2101310343 metadata/md5-cache/media-video/yle-dl-20201022
+2102011639 metadata/md5-cache/media-video/Manifest.gz
+2102011639 metadata/md5-cache/media-video/google2srt-0.5.6-r1
+2102011639 metadata/md5-cache/media-video/rav1e-0.3.5
 1910070809 metadata/md5-cache/net-analyzer/arptools-1.0.2
 1906051110 metadata/md5-cache/net-analyzer/authforce-0.9.9-r2
 1910071209 metadata/md5-cache/net-analyzer/fprobe-1.1-r3
@@ -51374,7 +51158,6 @@
 2101231224 metadata/md5-cache/net-analyzer/fragroute-1.2.6-r4
 2101231224 metadata/md5-cache/net-analyzer/fwlogwatch-1.4
 2101231224 metadata/md5-cache/net-analyzer/fwlogwatch-1.5
-2101231224 metadata/md5-cache/net-analyzer/gensink-4.1-r2
 2101231224 metadata/md5-cache/net-analyzer/gnome-nettool-3.8.1
 2101231224 metadata/md5-cache/net-analyzer/goaccess-1.4.2
 2101231224 metadata/md5-cache/net-analyzer/goaccess-9999
@@ -51618,10 +51401,8 @@
 2101281509 metadata/md5-cache/net-analyzer/zabbix-4.0.27-r1
 2101281509 metadata/md5-cache/net-analyzer/zabbix-4.0.28
 2101281509 metadata/md5-cache/net-analyzer/zabbix-5.0.6-r1
-2101281509 metadata/md5-cache/net-analyzer/zabbix-5.0.7
 2101281509 metadata/md5-cache/net-analyzer/zabbix-5.0.8
 2101281509 metadata/md5-cache/net-analyzer/zabbix-5.2.2-r1
-2101281509 metadata/md5-cache/net-analyzer/zabbix-5.2.3
 2101281509 metadata/md5-cache/net-analyzer/zabbix-5.2.4
 2101310343 metadata/md5-cache/net-analyzer/2ping-4.4.1
 2101310343 metadata/md5-cache/net-analyzer/2ping-4.5
@@ -51672,8 +51453,11 @@
 2101310343 metadata/md5-cache/net-analyzer/wapiti-9999
 2101310343 metadata/md5-cache/net-analyzer/wireshark-3.4.2-r100
 2101310343 metadata/md5-cache/net-analyzer/wireshark-99999999
-2102011139 metadata/md5-cache/net-analyzer/Manifest.gz
 2102010809 metadata/md5-cache/net-analyzer/wireshark-3.4.3
+2102011639 metadata/md5-cache/net-analyzer/Manifest.gz
+2102011639 metadata/md5-cache/net-analyzer/gensink-4.1-r2
+2102011639 metadata/md5-cache/net-analyzer/zabbix-5.0.7
+2102011639 metadata/md5-cache/net-analyzer/zabbix-5.2.3
 1704281609 metadata/md5-cache/net-dialup/dial-1.2-r2
 2012311940 metadata/md5-cache/net-dialup/ppp-scripts-0
 2012311940 metadata/md5-cache/net-dialup/wvdial-1.61
@@ -51792,7 +51576,6 @@
 2101231224 metadata/md5-cache/net-dns/pdns-recursor-4.4.1
 2101231224 metadata/md5-cache/net-dns/pdns-recursor-4.4.2
 2101231224 metadata/md5-cache/net-dns/pdns-recursor-4.4.2-r100
-2101231224 metadata/md5-cache/net-dns/pdnsd-1.2.9a-r1
 2101231224 metadata/md5-cache/net-dns/pdnsd-1.2.9a-r2
 2101231224 metadata/md5-cache/net-dns/rbldnsd-0.998b-r2
 2101231224 metadata/md5-cache/net-dns/resolv_wrapper-1.1.5
@@ -51804,7 +51587,6 @@
 2101261939 metadata/md5-cache/net-dns/nsd-4.3.5
 2101282239 metadata/md5-cache/net-dns/dnsmasq-2.83-r101
 2101282239 metadata/md5-cache/net-dns/dnsmasq-2.84-r101
-2101310343 metadata/md5-cache/net-dns/Manifest.gz
 2101310343 metadata/md5-cache/net-dns/avahi-0.8-r2
 2101310343 metadata/md5-cache/net-dns/bind-9.16.10
 2101310343 metadata/md5-cache/net-dns/bind-9.16.11
@@ -51817,6 +51599,7 @@
 2101301739 metadata/md5-cache/net-dns/mydns-1.2.8.31-r2
 2101310343 metadata/md5-cache/net-dns/unbound-1.13.0
 2101310343 metadata/md5-cache/net-dns/unbound-1.13.0-r1
+2102011809 metadata/md5-cache/net-dns/Manifest.gz
 1902190039 metadata/md5-cache/net-firewall/ipkungfu-0.6.1-r1
 2001260341 metadata/md5-cache/net-firewall/lutelwall-0.99-r1
 2101231224 metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.3
@@ -51902,11 +51685,9 @@
 2101261939 metadata/md5-cache/net-fs/minio-2021.01.16.02.19.44-r2
 2101270639 metadata/md5-cache/net-fs/netatalk-3.1.12-r1
 2101281009 metadata/md5-cache/net-fs/autofs-5.1.7
-2101312209 metadata/md5-cache/net-fs/Manifest.gz
 2101310343 metadata/md5-cache/net-fs/btfs-2.22
 2101310343 metadata/md5-cache/net-fs/btfs-2.23
 2101310343 metadata/md5-cache/net-fs/cifs-utils-6.12
-2101301739 metadata/md5-cache/net-fs/davfs2-1.6.0
 2101310343 metadata/md5-cache/net-fs/samba-4.12.11
 2101310343 metadata/md5-cache/net-fs/samba-4.12.9-r1
 2101310343 metadata/md5-cache/net-fs/samba-4.13.3-r1
@@ -51915,11 +51696,12 @@
 2101312209 metadata/md5-cache/net-fs/smbnetfs-0.6.3
 2101310343 metadata/md5-cache/net-fs/sshfs-3.7.0
 2101310343 metadata/md5-cache/net-fs/sshfs-3.7.1
+2102011639 metadata/md5-cache/net-fs/Manifest.gz
+2102011639 metadata/md5-cache/net-fs/davfs2-1.6.0
 1910111911 metadata/md5-cache/net-ftp/cmdftp-0.9.8
 2009300009 metadata/md5-cache/net-ftp/uftpd-2.13
 2012231444 metadata/md5-cache/net-ftp/tnftp-20141104
 2012231444 metadata/md5-cache/net-ftp/tnftp-20151004
-2101231224 metadata/md5-cache/net-ftp/atftp-0.7.2-r3
 2101231224 metadata/md5-cache/net-ftp/filezilla-3.51.0
 2101231224 metadata/md5-cache/net-ftp/filezilla-3.52.0.5
 2101231224 metadata/md5-cache/net-ftp/filezilla-3.52.2
@@ -51942,7 +51724,8 @@
 2101241339 metadata/md5-cache/net-ftp/ftpbase-0.01-r4
 2101241539 metadata/md5-cache/net-ftp/pureadmin-0.4-r2
 2101251539 metadata/md5-cache/net-ftp/atftp-0.7.2-r2
-2101262139 metadata/md5-cache/net-ftp/Manifest.gz
+2102020139 metadata/md5-cache/net-ftp/Manifest.gz
+2102020139 metadata/md5-cache/net-ftp/atftp-0.7.2-r3
 1702282328 metadata/md5-cache/net-im/gg-transport-2.2.6
 1907282009 metadata/md5-cache/net-im/telepathy-connection-managers-2-r2
 1912201239 metadata/md5-cache/net-im/tkabber-1.1.2
@@ -51981,7 +51764,6 @@
 2101231224 metadata/md5-cache/net-im/ejabberd-20.07
 2101231224 metadata/md5-cache/net-im/ekg2-0.4_pre20190315
 2101231224 metadata/md5-cache/net-im/ekg2-9999
-2101231224 metadata/md5-cache/net-im/element-desktop-bin-1.7.16
 2101231224 metadata/md5-cache/net-im/gitter-bin-4.1.0-r1
 2101231224 metadata/md5-cache/net-im/kouchat-1.1.0
 2101231224 metadata/md5-cache/net-im/libcommuni-3.5.0_p20200711
@@ -52031,8 +51813,9 @@
 2101310343 metadata/md5-cache/net-im/toxic-0.8.3-r2
 2101310343 metadata/md5-cache/net-im/transwhat-0.2.2_p20190426-r1
 2101310343 metadata/md5-cache/net-im/yowsup-3.2.3_p20190905
-2102011409 metadata/md5-cache/net-im/Manifest.gz
 2102011409 metadata/md5-cache/net-im/zoom-5.5.6955.0131
+2102011539 metadata/md5-cache/net-im/Manifest.gz
+2102011539 metadata/md5-cache/net-im/element-desktop-bin-1.7.18
 1812301839 metadata/md5-cache/net-irc/eggdrop-1.8.4
 1802070108 metadata/md5-cache/net-irc/ninja-1.5.9_pre14-r1
 2002112051 metadata/md5-cache/net-irc/bnc-2.9.4-r1
@@ -52104,7 +51887,6 @@
 1803282239 metadata/md5-cache/net-libs/libblkmaker-0.3.2
 1803282239 metadata/md5-cache/net-libs/libblkmaker-0.4.3
 1803282239 metadata/md5-cache/net-libs/libblkmaker-0.5.3
-1904151309 metadata/md5-cache/net-libs/libprotoident-2.0.13
 1907151840 metadata/md5-cache/net-libs/libsrsirc-0.0.14-r1
 1807061439 metadata/md5-cache/net-libs/wandio-1.0.5
 1807061439 metadata/md5-cache/net-libs/wandio-4.0.0
@@ -52259,7 +52041,6 @@
 2101231224 metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1
 2101231224 metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0
 2101231224 metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1
-2101231224 metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
 2101231224 metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
 2101231224 metadata/md5-cache/net-libs/libnetfilter_queue-1.0.4
 2101231224 metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
@@ -52285,7 +52066,6 @@
 2101231224 metadata/md5-cache/net-libs/libpcap-9999
 2101231224 metadata/md5-cache/net-libs/libpcapnav-0.8-r1
 2101231224 metadata/md5-cache/net-libs/libpri-1.6.0
-2101231224 metadata/md5-cache/net-libs/libprotoident-2.0.12
 2101231224 metadata/md5-cache/net-libs/libprotoident-2.0.14_p1
 2101231224 metadata/md5-cache/net-libs/libprotoident-9999
 2101231224 metadata/md5-cache/net-libs/libproxy-0.4.16-r1
@@ -52350,7 +52130,6 @@
 2101231224 metadata/md5-cache/net-libs/neon-0.31.0
 2101231224 metadata/md5-cache/net-libs/neon-0.31.1
 2101231224 metadata/md5-cache/net-libs/neon-0.31.2
-2101231224 metadata/md5-cache/net-libs/net6-1.3.14-r2
 2101231224 metadata/md5-cache/net-libs/netwib-5.39.0
 2101231224 metadata/md5-cache/net-libs/nghttp2-1.41.0
 2101231224 metadata/md5-cache/net-libs/nghttp2-1.42.0
@@ -52372,7 +52151,6 @@
 2101231224 metadata/md5-cache/net-libs/pjproject-2.9-r2
 2101231224 metadata/md5-cache/net-libs/quiche-0.5.1
 2101231224 metadata/md5-cache/net-libs/quiche-0.6.0
-2101231224 metadata/md5-cache/net-libs/quiche-9999
 2101231224 metadata/md5-cache/net-libs/qxmpp-1.2.0
 2101231224 metadata/md5-cache/net-libs/qxmpp-9999
 2101231224 metadata/md5-cache/net-libs/rabbitmq-c-0.10.0
@@ -52458,14 +52236,18 @@
 2101310343 metadata/md5-cache/net-libs/xrootd-4.12.5
 2101310343 metadata/md5-cache/net-libs/xrootd-5.0.2
 2101310343 metadata/md5-cache/net-libs/xrootd-5.0.3
-2102011309 metadata/md5-cache/net-libs/Manifest.gz
-2102010909 metadata/md5-cache/net-libs/libgsasl-1.10.0
 2102010909 metadata/md5-cache/net-libs/libgsasl-1.8.0-r1
 2102010909 metadata/md5-cache/net-libs/libgsasl-1.8.1
-2102011139 metadata/md5-cache/net-libs/libsrtp-2.3.0-r1
 2102011309 metadata/md5-cache/net-libs/libyang-1.0.184
 2102011309 metadata/md5-cache/net-libs/libyang-1.0.215
 2102010809 metadata/md5-cache/net-libs/mbedtls-2.25.0
+2102020139 metadata/md5-cache/net-libs/Manifest.gz
+2102020139 metadata/md5-cache/net-libs/libgsasl-1.10.0
+2102011639 metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
+2102011639 metadata/md5-cache/net-libs/libsrtp-2.3.0-r1
+2102011639 metadata/md5-cache/net-libs/net6-1.3.14-r2
+2102011909 metadata/md5-cache/net-libs/quiche-0.7.0
+2102011909 metadata/md5-cache/net-libs/quiche-9999
 1904081739 metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r5
 1910170740 metadata/md5-cache/net-mail/mhonarc-gentoo-2.6.18-r2
 1907061239 metadata/md5-cache/net-mail/mpop-1.4.4
@@ -52536,7 +52318,6 @@
 2101231224 metadata/md5-cache/net-mail/mess822-0.58-r2
 2101231224 metadata/md5-cache/net-mail/metamail-2.7.53.3-r2
 2101231224 metadata/md5-cache/net-mail/mpack-1.6-r4
-2101231224 metadata/md5-cache/net-mail/mswatch-1.2.0-r1
 2101231224 metadata/md5-cache/net-mail/mu-1.4.13
 2101231224 metadata/md5-cache/net-mail/pfqueue-0.5.6
 2101231224 metadata/md5-cache/net-mail/popa3d-1.0.2-r1
@@ -52600,8 +52381,9 @@
 2101310343 metadata/md5-cache/net-mail/onionrouter-9999
 2101310343 metadata/md5-cache/net-mail/postorius-1.3.3
 2101310343 metadata/md5-cache/net-mail/queue-repair-0.9.0-r2
-2102010209 metadata/md5-cache/net-mail/Manifest.gz
 2102010209 metadata/md5-cache/net-mail/rss2email-3.12.2-r1
+2102011639 metadata/md5-cache/net-mail/Manifest.gz
+2102011639 metadata/md5-cache/net-mail/mswatch-1.2.0-r1
 1910170740 metadata/md5-cache/net-misc/arpsponge-3.17.11
 1910022239 metadata/md5-cache/net-misc/autossh-1.4g
 1911110039 metadata/md5-cache/net-misc/autoupnp-0.4.7
@@ -52645,7 +52427,6 @@
 2004131109 metadata/md5-cache/net-misc/asterisk-opus-16.0.1.3.0
 2004140139 metadata/md5-cache/net-misc/geoipupdate-3.1.0
 2004140139 metadata/md5-cache/net-misc/geoipupdate-3.1.1
-2006160009 metadata/md5-cache/net-misc/ipv6calc-2.2.0
 2006212208 metadata/md5-cache/net-misc/knock-0.7-r1
 2007081809 metadata/md5-cache/net-misc/dhcdrop-0.5-r1
 2007201539 metadata/md5-cache/net-misc/asterisk-core-sounds-1.6.1-r1
@@ -53051,7 +52832,6 @@
 2101260039 metadata/md5-cache/net-misc/zerotier-1.6.2
 2101262109 metadata/md5-cache/net-misc/ntp-4.2.8_p15
 2101280109 metadata/md5-cache/net-misc/bridge-utils-1.6
-2101271809 metadata/md5-cache/net-misc/dropbox-114.4.426
 2101282139 metadata/md5-cache/net-misc/radvd-2.19
 2101310343 metadata/md5-cache/net-misc/casync-2_p20190407
 2101310343 metadata/md5-cache/net-misc/chrome-remote-desktop-88.0.4324.33
@@ -53086,7 +52866,6 @@
 2101312209 metadata/md5-cache/net-misc/httpie-2.3.0
 2101310343 metadata/md5-cache/net-misc/httpstat-1.3.1
 2101310343 metadata/md5-cache/net-misc/iputils-20190709-r1
-2101310343 metadata/md5-cache/net-misc/iputils-20200821-r2
 2101310343 metadata/md5-cache/net-misc/iputils-99999999
 2101311239 metadata/md5-cache/net-misc/minidlna-1.3.0-r1
 2101310343 metadata/md5-cache/net-misc/ncman-0.0.1_p20190327-r2
@@ -53127,7 +52906,6 @@
 2101310343 metadata/md5-cache/net-misc/streamlink-1.3.1-r1
 2101310343 metadata/md5-cache/net-misc/streamlink-2.0.0
 2101310343 metadata/md5-cache/net-misc/streamlink-9999
-2101312209 metadata/md5-cache/net-misc/suite3270-4.0_p13
 2101310343 metadata/md5-cache/net-misc/wget-1.20.3-r3
 2101310343 metadata/md5-cache/net-misc/wget-1.21-r1
 2101310343 metadata/md5-cache/net-misc/wget-1.21.1
@@ -53136,14 +52914,19 @@
 2101310343 metadata/md5-cache/net-misc/youtube-dl-2021.01.16
 2101310343 metadata/md5-cache/net-misc/youtube-dl-2021.01.24.1
 2101310343 metadata/md5-cache/net-misc/youtube-dl-9999
-2102010909 metadata/md5-cache/net-misc/Manifest.gz
 2102010309 metadata/md5-cache/net-misc/curl-7.74.0-r4
-2102010909 metadata/md5-cache/net-misc/gsasl-1.10.0
 2102010909 metadata/md5-cache/net-misc/gsasl-1.8.0-r1
 2102010909 metadata/md5-cache/net-misc/gsasl-1.8.1
 2102010009 metadata/md5-cache/net-misc/icaclient-20.12.0.12-r2
 2102010009 metadata/md5-cache/net-misc/icaclient-21.1.0.14
 2102010339 metadata/md5-cache/net-misc/teamviewer-15.14.3
+2102020739 metadata/md5-cache/net-misc/Manifest.gz
+2102011609 metadata/md5-cache/net-misc/dropbox-114.4.426
+2102011639 metadata/md5-cache/net-misc/gsasl-1.10.0
+2102011839 metadata/md5-cache/net-misc/iputils-20200821-r2
+2102012109 metadata/md5-cache/net-misc/ipv6calc-2.2.0
+2102020739 metadata/md5-cache/net-misc/suite3270-4.0_p13
+2102011809 metadata/md5-cache/net-misc/teamviewer-15.14.5
 1911091712 metadata/md5-cache/net-nds/led-1.111
 2011031239 metadata/md5-cache/net-nds/smbldap-tools-0.9.10-r1
 2012231444 metadata/md5-cache/net-nds/phpldapadmin-1.2.5
@@ -53225,7 +53008,6 @@
 2101231224 metadata/md5-cache/net-p2p/go-ipfs-0.7.0
 2101231224 metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.22
 2101231224 metadata/md5-cache/net-p2p/go-ipfs-bin-0.7.0
-2101231224 metadata/md5-cache/net-p2p/gtk-gnutella-1.1.15
 2101231224 metadata/md5-cache/net-p2p/gtorrentviewer-0.2b
 2101231224 metadata/md5-cache/net-p2p/ktorrent-20.12.1
 2101231224 metadata/md5-cache/net-p2p/ktorrent-5.2.0-r1
@@ -53285,8 +53067,8 @@
 2101310343 metadata/md5-cache/net-p2p/nicotine+-2.2.2
 2101310343 metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
 2101310343 metadata/md5-cache/net-p2p/tremc-0.9.2
-2102011139 metadata/md5-cache/net-p2p/Manifest.gz
 2102011139 metadata/md5-cache/net-p2p/gtk-gnutella-1.2.0-r1
+2102012239 metadata/md5-cache/net-p2p/Manifest.gz
 1702282329 metadata/md5-cache/net-print/fax4cups-1.29-r1
 1702282329 metadata/md5-cache/net-print/ink-0.5.1
 1702282329 metadata/md5-cache/net-print/ink-0.5.2
@@ -53459,7 +53241,6 @@
 2101231224 metadata/md5-cache/net-vpn/tinc-1.0.36
 2101231224 metadata/md5-cache/net-vpn/tinc-1.1_pre17-r1
 2101231224 metadata/md5-cache/net-vpn/tor-0.4.4.6
-2101231224 metadata/md5-cache/net-vpn/tor-0.4.5.2_alpha
 2101231224 metadata/md5-cache/net-vpn/vpnc-0.5.3_p550-r2
 2101231224 metadata/md5-cache/net-vpn/vpncwatch-1.8.1
 2101231224 metadata/md5-cache/net-vpn/vtun-3.0.3-r2
@@ -53476,7 +53257,8 @@
 2101310343 metadata/md5-cache/net-vpn/openconnect-9999
 2101310343 metadata/md5-cache/net-vpn/protonvpn-cli-2.2.2
 2101310343 metadata/md5-cache/net-vpn/protonvpn-cli-2.2.4
-2102011309 metadata/md5-cache/net-vpn/Manifest.gz
+2102020039 metadata/md5-cache/net-vpn/Manifest.gz
+2102020039 metadata/md5-cache/net-vpn/tor-0.4.5.4_rc
 1808170009 metadata/md5-cache/net-wireless/bladerf-firmware-2.2.0
 1808170009 metadata/md5-cache/net-wireless/bladerf-fpga-0.7.3
 1909122209 metadata/md5-cache/net-wireless/gr-scan-20160211
@@ -53596,13 +53378,10 @@
 2101231224 metadata/md5-cache/net-wireless/yatebts-9999
 2101271809 metadata/md5-cache/net-wireless/unifi-6.0.45
 2101290439 metadata/md5-cache/net-wireless/unifi-6.1.51
-2101310343 metadata/md5-cache/net-wireless/Manifest.gz
 2101310343 metadata/md5-cache/net-wireless/aircrack-ng-1.6-r1
 2101310343 metadata/md5-cache/net-wireless/aircrack-ng-1.6_p20200722
 2101310343 metadata/md5-cache/net-wireless/aircrack-ng-9999
 2101310343 metadata/md5-cache/net-wireless/blueberry-1.3.9
-2101310343 metadata/md5-cache/net-wireless/blueman-2.1.4
-2101310343 metadata/md5-cache/net-wireless/blueman-9999
 2101310343 metadata/md5-cache/net-wireless/bluez-5.55
 2101310343 metadata/md5-cache/net-wireless/crda-4.14
 2101310343 metadata/md5-cache/net-wireless/gnome-bluetooth-3.34.1
@@ -53649,6 +53428,9 @@
 2101310343 metadata/md5-cache/net-wireless/uhd-4.0.0.0
 2101310343 metadata/md5-cache/net-wireless/urh-2.8.8
 2101310343 metadata/md5-cache/net-wireless/urh-9999
+2102012209 metadata/md5-cache/net-wireless/Manifest.gz
+2102012209 metadata/md5-cache/net-wireless/blueman-2.1.4
+2102012209 metadata/md5-cache/net-wireless/blueman-9999
 2012281255 metadata/md5-cache/perl-core/Archive-Tar-2.300.0
 2012281255 metadata/md5-cache/perl-core/CPAN-Meta-2.150.1
 2012281255 metadata/md5-cache/perl-core/File-Path-2.130.0
@@ -54116,14 +53898,12 @@
 2101231224 metadata/md5-cache/sci-chemistry/xyza2pipe-20121001
 2101310343 metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0
 2101310343 metadata/md5-cache/sci-chemistry/MDAnalysis-1.0.0
-2101310343 metadata/md5-cache/sci-chemistry/Manifest.gz
 2101310343 metadata/md5-cache/sci-chemistry/chemex-2018.10.3
 2101310343 metadata/md5-cache/sci-chemistry/gmxapi-0.0.7.1-r1
 2101310343 metadata/md5-cache/sci-chemistry/gromacs-2020.4
 2101310343 metadata/md5-cache/sci-chemistry/gromacs-2020.5
 2101310343 metadata/md5-cache/sci-chemistry/gromacs-2020.9999
 2101310343 metadata/md5-cache/sci-chemistry/gromacs-2021.9999
-2101310343 metadata/md5-cache/sci-chemistry/gromacs-2021_rc1
 2101310343 metadata/md5-cache/sci-chemistry/gromacs-9999
 2101310343 metadata/md5-cache/sci-chemistry/mdtraj-1.9.4
 2101310343 metadata/md5-cache/sci-chemistry/modeller-9.25
@@ -54132,6 +53912,8 @@
 2101310343 metadata/md5-cache/sci-chemistry/propka-3.2.0
 2101310343 metadata/md5-cache/sci-chemistry/pymol-2.4.0-r1
 2101310343 metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha43
+2102011539 metadata/md5-cache/sci-chemistry/Manifest.gz
+2102011539 metadata/md5-cache/sci-chemistry/gromacs-2021
 1702282330 metadata/md5-cache/sci-electronics/espresso-ab-1.0-r1
 1702282330 metadata/md5-cache/sci-electronics/freehdl-0.0.8
 1704192008 metadata/md5-cache/sci-electronics/labone-16.12.42529
@@ -54857,263 +54639,6 @@
 2101310343 metadata/md5-cache/sci-visualization/veusz-3.2
 2003191139 metadata/md5-cache/sec-policy/apparmor-profiles-2.13.4
 2010101309 metadata/md5-cache/sec-policy/apparmor-profiles-3.0.0
-2010120609 metadata/md5-cache/sec-policy/selinux-base-policy-2.20190609-r1
-2011030839 metadata/md5-cache/sec-policy/selinux-base-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-abrt-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-accountsd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-acct-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-ada-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-afs-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-aide-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-alsa-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-amanda-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-amavis-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-android-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-apache-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-apcupsd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-apm-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-arpwatch-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-asterisk-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-at-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-automount-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-avahi-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-awstats-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-backup-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-bacula-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-bind-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-bitcoin-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-bitlbee-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-bluetooth-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-brctl-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-calamaris-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-canna-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-ccs-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-cdrecord-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-ceph-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-cgmanager-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-cgroup-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-chromium-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-chronyd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-clamav-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-clockspeed-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-collectd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-colord-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-corosync-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-couchdb-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-courier-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-cups-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-cvs-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-cyphesis-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-daemontools-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-dante-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-dbadm-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-dbskk-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-dbus-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-dcc-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-ddclient-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-denyhosts-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-devicekit-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-dhcp-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-dictd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-dirmngr-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-dirsrv-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-distcc-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-djbdns-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-dkim-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-dmidecode-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-dovecot-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-dpkg-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-dracut-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-dropbox-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-entropyd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-evolution-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-exim-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-fail2ban-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-fetchmail-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-finger-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-flash-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-fprintd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-ftp-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-games-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-git-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-gitosis-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-gnome-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-googletalk-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-gorg-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-gpg-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-gpm-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-gpsd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-gssproxy-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-hddtemp-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-howl-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-icecast-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-ifplugd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-imaze-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-inetd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-inn-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-ipsec-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-irc-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-ircd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-irqbalance-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-jabber-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-java-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-kdump-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-kerberos-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-kerneloops-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-kismet-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-kudzu-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-ldap-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-links-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-lircd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-loadkeys-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-lockdev-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-logrotate-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-logsentry-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-logwatch-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-lpd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-mailman-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-makewhatis-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-mandb-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-mcelog-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-memcached-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-milter-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-modemmanager-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-mono-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-mozilla-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-mpd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-mplayer-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-mrtg-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-munin-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-mutt-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-mysql-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-nagios-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-ncftool-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-networkmanager-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-nginx-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-nslcd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-ntop-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-ntp-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-nut-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-nx-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-oddjob-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-oident-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-openct-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-openrc-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-openvpn-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-pan-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-pcmcia-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-pcscd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-phpfpm-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-plymouthd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-podsleuth-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-policykit-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-portmap-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-postfix-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-postgresql-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-postgrey-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-ppp-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-prelink-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-prelude-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-privoxy-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-procmail-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-psad-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-publicfile-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-puppet-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-pyicqt-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-pyzor-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-qemu-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-qmail-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-quota-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-radius-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-radvd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-razor-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-redis-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-remotelogin-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-resolvconf-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-rgmanager-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-rngd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-roundup-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-rpc-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-rpcbind-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-rpm-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-rssh-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-rtkit-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-rtorrent-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-salt-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-samba-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-sasl-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-screen-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-sendmail-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-sensord-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-shorewall-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-shutdown-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-skype-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-slocate-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-slrnpull-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-smartmon-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-smokeping-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-snmp-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-snort-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-soundserver-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-spamassassin-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-speedtouch-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-squid-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-sssd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-stunnel-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-subsonic-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-sudo-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-sxid-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-syncthing-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-sysstat-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-tboot-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-tcpd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-tcsd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-telnet-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-tftp-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-tgtd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-thunderbird-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-timidity-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-tor-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-tripwire-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-ulogd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-uml-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-unconfined-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-uptime-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-uucp-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-uwimap-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-uwsgi-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-varnishd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-vbetool-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-vdagent-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-vde-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-virt-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-vlock-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-vmware-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-vnstatd-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-vpn-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-watchdog-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-webalizer-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-wine-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-wireshark-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-wm-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-xen-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-xfs-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-xprint-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-xserver-2.20190609-r1
-2011051309 metadata/md5-cache/sec-policy/selinux-zabbix-2.20190609-r1
 2011251039 metadata/md5-cache/sec-policy/apparmor-profiles-3.0.0-r1
 2011251039 metadata/md5-cache/sec-policy/apparmor-profiles-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-abrt-9999
@@ -55137,7 +54662,6 @@
 2011300739 metadata/md5-cache/sec-policy/selinux-backup-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-bacula-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-base-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-base-policy-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-bind-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-bitcoin-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-bitlbee-9999
@@ -55227,7 +54751,6 @@
 2011300739 metadata/md5-cache/sec-policy/selinux-kerneloops-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-kismet-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-ksmtuned-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-kudzu-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-ldap-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-links-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-lircd-9999
@@ -55267,11 +54790,9 @@
 2011300739 metadata/md5-cache/sec-policy/selinux-openrc-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-openvpn-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-pan-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-pcmcia-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-pcscd-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-phpfpm-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-plymouthd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-podsleuth-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-policykit-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-portmap-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-postfix-9999
@@ -55299,7 +54820,6 @@
 2011300739 metadata/md5-cache/sec-policy/selinux-resolvconf-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-rgmanager-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-rngd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-roundup-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-rpc-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-rpcbind-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-rpm-9999
@@ -55323,7 +54843,6 @@
 2011300739 metadata/md5-cache/sec-policy/selinux-snort-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-soundserver-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-spamassassin-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-speedtouch-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-squid-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-sssd-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-stunnel-9999
@@ -55368,7 +54887,6 @@
 2011300739 metadata/md5-cache/sec-policy/selinux-wm-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-xen-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-xfs-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-xprint-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-xscreensaver-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-xserver-9999
 2011300739 metadata/md5-cache/sec-policy/selinux-zabbix-9999
@@ -55628,8 +55146,9 @@
 2012030639 metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20200818-r2
 2012030639 metadata/md5-cache/sec-policy/selinux-xserver-2.20200818-r2
 2012030639 metadata/md5-cache/sec-policy/selinux-zabbix-2.20200818-r2
-2012081009 metadata/md5-cache/sec-policy/Manifest.gz
 2012081009 metadata/md5-cache/sec-policy/apparmor-profiles-3.0.1
+2102020739 metadata/md5-cache/sec-policy/Manifest.gz
+2102020739 metadata/md5-cache/sec-policy/selinux-base-policy-9999
 1712021939 metadata/md5-cache/sys-apps/byld-1.0.3
 1907281509 metadata/md5-cache/sys-apps/ckbcomp-1.164
 1711271440 metadata/md5-cache/sys-apps/clrngd-1.0.3
@@ -55960,7 +55479,6 @@
 2101231224 metadata/md5-cache/sys-apps/memtester-4.3.0
 2101231224 metadata/md5-cache/sys-apps/memtester-4.4.0
 2101231224 metadata/md5-cache/sys-apps/memtester-4.5.0
-2101231224 metadata/md5-cache/sys-apps/miller-5.10.0
 2101231224 metadata/md5-cache/sys-apps/miller-5.3.0
 2101231224 metadata/md5-cache/sys-apps/minijail-12
 2101231224 metadata/md5-cache/sys-apps/minijail-9
@@ -56109,7 +55627,6 @@
 2101251709 metadata/md5-cache/sys-apps/smartmontools-9999
 2101270509 metadata/md5-cache/sys-apps/init-system-helpers-1.60
 2101272039 metadata/md5-cache/sys-apps/flashrom-9999
-2101312039 metadata/md5-cache/sys-apps/Manifest.gz
 2101310343 metadata/md5-cache/sys-apps/accountsservice-0.6.55
 2101310343 metadata/md5-cache/sys-apps/apparmor-utils-2.13.4-r1
 2101310343 metadata/md5-cache/sys-apps/apparmor-utils-3.0.0-r1
@@ -56182,7 +55699,6 @@
 2101310343 metadata/md5-cache/sys-apps/systemd-247.2-r4
 2101310343 metadata/md5-cache/sys-apps/systemd-9999
 2101310343 metadata/md5-cache/sys-apps/systemd-tmpfiles-246
-2101302239 metadata/md5-cache/sys-apps/sysvinit-2.98-r1
 2101310343 metadata/md5-cache/sys-apps/tuned-2.13.0-r1
 2101310343 metadata/md5-cache/sys-apps/tuned-2.15.0
 2101312039 metadata/md5-cache/sys-apps/usbguard-0.7.8
@@ -56197,6 +55713,11 @@
 2101310343 metadata/md5-cache/sys-apps/util-linux-2.36.1-r1
 2101310343 metadata/md5-cache/sys-apps/util-linux-9999
 2101310343 metadata/md5-cache/sys-apps/x86info-1.30_p20190617
+2102012109 metadata/md5-cache/sys-apps/Manifest.gz
+2102011809 metadata/md5-cache/sys-apps/logwatch-7.5.5
+2102011639 metadata/md5-cache/sys-apps/miller-5.10.0
+2102011809 metadata/md5-cache/sys-apps/rng-tools-6.11
+2102012109 metadata/md5-cache/sys-apps/sysvinit-2.98-r1
 1802112038 metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1
 2009131039 metadata/md5-cache/sys-auth/nss-myhostname-0.3-r1
 2009141809 metadata/md5-cache/sys-auth/docker_auth-1.5.0
@@ -56265,7 +55786,6 @@
 2101231224 metadata/md5-cache/sys-auth/yubico-piv-tool-2.1.1-r2
 2101231224 metadata/md5-cache/sys-auth/yubico-piv-tool-2.2.0
 2101231224 metadata/md5-cache/sys-auth/yubikey-personalization-gui-3.1.25
-2101310343 metadata/md5-cache/sys-auth/Manifest.gz
 2101310343 metadata/md5-cache/sys-auth/authenticator-0.2.4-r1
 2101310343 metadata/md5-cache/sys-auth/authenticator-9999
 2101310343 metadata/md5-cache/sys-auth/elogind-243.7
@@ -56284,7 +55804,6 @@
 2101310343 metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r2
 2101310343 metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r3
 2101310343 metadata/md5-cache/sys-auth/pambase-20201103
-2101310343 metadata/md5-cache/sys-auth/pambase-999999999
 2101310343 metadata/md5-cache/sys-auth/rtkit-0.13-r1
 2101310343 metadata/md5-cache/sys-auth/seatd-0.4.0-r1
 2101310343 metadata/md5-cache/sys-auth/seatd-9999
@@ -56293,6 +55812,9 @@
 2101310343 metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.2
 2101310343 metadata/md5-cache/sys-auth/sssd-2.3.1-r2
 2101310343 metadata/md5-cache/sys-auth/sssd-2.4.0
+2102012239 metadata/md5-cache/sys-auth/Manifest.gz
+2102012239 metadata/md5-cache/sys-auth/pambase-20210201
+2102011709 metadata/md5-cache/sys-auth/pambase-999999999
 1910191339 metadata/md5-cache/sys-block/devio-1.2
 1911072009 metadata/md5-cache/sys-block/endpoint-0.1.0-r1
 1702282333 metadata/md5-cache/sys-block/flashbench-20120606
@@ -56388,8 +55910,6 @@
 2101231224 metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.0
 2101231224 metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.6
 2101231224 metadata/md5-cache/sys-block/thin-provisioning-tools-0.8.5
-2101231224 metadata/md5-cache/sys-block/thin-provisioning-tools-0.9.0
-2101231224 metadata/md5-cache/sys-block/thin-provisioning-tools-9999
 2101231224 metadata/md5-cache/sys-block/vblade-24
 2101231224 metadata/md5-cache/sys-block/whdd-3.0.1
 2101231224 metadata/md5-cache/sys-block/whdd-9999
@@ -56400,10 +55920,12 @@
 2101310343 metadata/md5-cache/sys-block/fio-3.19
 2101310343 metadata/md5-cache/sys-block/seekwatcher-0.13
 2101310343 metadata/md5-cache/sys-block/targetcli-fb-2.1.53
-2102011139 metadata/md5-cache/sys-block/Manifest.gz
 2102010109 metadata/md5-cache/sys-block/di-4.48
-2102011139 metadata/md5-cache/sys-block/fio-3.20-r2
-2102011139 metadata/md5-cache/sys-block/libzbc-5.5.1
+2102020739 metadata/md5-cache/sys-block/Manifest.gz
+2102020739 metadata/md5-cache/sys-block/fio-3.20-r2
+2102020739 metadata/md5-cache/sys-block/libzbc-5.5.1
+2102012209 metadata/md5-cache/sys-block/thin-provisioning-tools-0.9.0
+2102012209 metadata/md5-cache/sys-block/thin-provisioning-tools-9999
 1907151840 metadata/md5-cache/sys-boot/bootcreator-1.2
 1911100139 metadata/md5-cache/sys-boot/makebootfat-1.4
 1910191339 metadata/md5-cache/sys-boot/nettrom-2.3.3
@@ -57023,8 +56545,6 @@
 2101231224 metadata/md5-cache/sys-fs/cachefilesd-0.10.10-r1
 2101231224 metadata/md5-cache/sys-fs/cachefilesd-0.10.9
 2101231224 metadata/md5-cache/sys-fs/clamfs-1.2.0
-2101231224 metadata/md5-cache/sys-fs/compsize-1.3
-2101231224 metadata/md5-cache/sys-fs/compsize-9999
 2101231224 metadata/md5-cache/sys-fs/copyfs-1.0.1-r1
 2101231224 metadata/md5-cache/sys-fs/cramfs-1.1
 2101231224 metadata/md5-cache/sys-fs/cramfs-2.1
@@ -57193,8 +56713,11 @@
 2101310343 metadata/md5-cache/sys-fs/zfs-0.8.6
 2101310343 metadata/md5-cache/sys-fs/zfs-2.0.1
 2101310343 metadata/md5-cache/sys-fs/zfs-9999
-2102011309 metadata/md5-cache/sys-fs/Manifest.gz
 2102011309 metadata/md5-cache/sys-fs/dosfstools-4.2
+2102011639 metadata/md5-cache/sys-fs/Manifest.gz
+2102011639 metadata/md5-cache/sys-fs/compsize-1.3
+2102011639 metadata/md5-cache/sys-fs/compsize-1.4
+2102011639 metadata/md5-cache/sys-fs/compsize-9999
 2003261841 metadata/md5-cache/sys-kernel/installkernel-gentoo-1
 2004270309 metadata/md5-cache/sys-kernel/installkernel-gentoo-2
 2009130915 metadata/md5-cache/sys-kernel/dracut-crypt-ssh-1.0.7
@@ -57362,8 +56885,9 @@
 2101302339 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.254
 2101302339 metadata/md5-cache/sys-kernel/vanilla-sources-5.10.12
 2101302339 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.94
-2102010209 metadata/md5-cache/sys-kernel/Manifest.gz
 2102010209 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.12-r1
+2102011509 metadata/md5-cache/sys-kernel/Manifest.gz
+2102011509 metadata/md5-cache/sys-kernel/git-sources-5.11_rc6
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.6
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.7
 1908101709 metadata/md5-cache/sys-libs/libservicelog-1.1.18
@@ -57396,7 +56920,6 @@
 2101231224 metadata/md5-cache/sys-libs/gpm-1.20.7-r2
 2101231224 metadata/md5-cache/sys-libs/gwenhywfar-5.4.1-r1
 2101231224 metadata/md5-cache/sys-libs/kpmcore-20.12.1
-2101231224 metadata/md5-cache/sys-libs/kpmcore-4.2.0
 2101231224 metadata/md5-cache/sys-libs/libaal-1.0.7-r1
 2101231224 metadata/md5-cache/sys-libs/libaal-1.0.7-r2
 2101231224 metadata/md5-cache/sys-libs/libavc1394-0.5.4-r2
@@ -57495,7 +57018,6 @@
 2101262109 metadata/md5-cache/sys-libs/zlib-1.2.11-r3
 2101271039 metadata/md5-cache/sys-libs/timezone-data-2021a
 2101291309 metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.7
-2101310343 metadata/md5-cache/sys-libs/Manifest.gz
 2101300739 metadata/md5-cache/sys-libs/binutils-libs-2.35.1-r1
 2101310343 metadata/md5-cache/sys-libs/compiler-rt-10.0.1
 2101310343 metadata/md5-cache/sys-libs/compiler-rt-11.0.0
@@ -57597,6 +57119,10 @@
 2101310343 metadata/md5-cache/sys-libs/tdb-1.4.3
 2101310343 metadata/md5-cache/sys-libs/tevent-0.10.2
 2101302239 metadata/md5-cache/sys-libs/timezone-data-2020e
+2102020039 metadata/md5-cache/sys-libs/Manifest.gz
+2102020039 metadata/md5-cache/sys-libs/glibc-2.33
+2102012109 metadata/md5-cache/sys-libs/kpmcore-4.2.0
+2102020039 metadata/md5-cache/sys-libs/ncurses-6.2_p20210123
 1902071639 metadata/md5-cache/sys-power/acpi-1.7-r1
 1901132309 metadata/md5-cache/sys-power/hibernate-script-2.0-r6
 1907151840 metadata/md5-cache/sys-power/uhubctl-1.8-r1
@@ -57643,9 +57169,10 @@
 2101231224 metadata/md5-cache/sys-power/upower-0.99.11
 2101231224 metadata/md5-cache/sys-power/upower-0.99.9-r1
 2101282309 metadata/md5-cache/sys-power/thermald-2.4.1-r1
-2101310343 metadata/md5-cache/sys-power/Manifest.gz
 2101310343 metadata/md5-cache/sys-power/acpilight-1.2
 2101310343 metadata/md5-cache/sys-power/acpilight-1.2-r1
+2102020109 metadata/md5-cache/sys-power/Manifest.gz
+2102020109 metadata/md5-cache/sys-power/uhubctl-2.3.0
 2002112051 metadata/md5-cache/sys-process/supervise-scripts-4.0-r1
 2003261841 metadata/md5-cache/sys-process/psmisc-23.2-r2
 2004211009 metadata/md5-cache/sys-process/psmisc-23.1-r1
@@ -57717,7 +57244,6 @@
 2101240209 metadata/md5-cache/sys-process/at-3.2.1-r1
 2101240209 metadata/md5-cache/sys-process/parallel-20201222
 2101260139 metadata/md5-cache/sys-process/procps-3.3.16-r3
-2101310343 metadata/md5-cache/sys-process/Manifest.gz
 2101310343 metadata/md5-cache/sys-process/audit-2.8.5-r2
 2101310343 metadata/md5-cache/sys-process/audit-3.0
 2101310343 metadata/md5-cache/sys-process/bcron-0.11
@@ -57736,6 +57262,8 @@
 2101300009 metadata/md5-cache/sys-process/numactl-2.0.14
 2101310343 metadata/md5-cache/sys-process/systemd-cron-1.5.14
 2101310343 metadata/md5-cache/sys-process/systemd-cron-1.5.15
+2102011639 metadata/md5-cache/sys-process/Manifest.gz
+2102011639 metadata/md5-cache/sys-process/evisum-0.5.10
 1706261108 metadata/md5-cache/virtual/linuxtv-dvb-headers-5.8
 1703291908 metadata/md5-cache/virtual/ooo-0
 1703291908 metadata/md5-cache/virtual/perl6-0
@@ -58156,7 +57684,6 @@
 2101280239 metadata/md5-cache/www-apps/nextcloud-19.0.8
 2101280239 metadata/md5-cache/www-apps/nextcloud-20.0.6
 2101281539 metadata/md5-cache/www-apps/postfixadmin-3.3.5
-2101312209 metadata/md5-cache/www-apps/Manifest.gz
 2101310343 metadata/md5-cache/www-apps/blohg-0.13-r4
 2101310343 metadata/md5-cache/www-apps/blohg-9999
 2101301309 metadata/md5-cache/www-apps/gitit-0.13.0.0-r1
@@ -58165,7 +57692,6 @@
 2101310343 metadata/md5-cache/www-apps/netbox-2.7.2
 2101310343 metadata/md5-cache/www-apps/netbox-2.7.6
 2101310343 metadata/md5-cache/www-apps/netbox-2.7.8
-2101312209 metadata/md5-cache/www-apps/nextcloud-20.0.5
 2101310343 metadata/md5-cache/www-apps/nikola-8.0.4
 2101310343 metadata/md5-cache/www-apps/nikola-8.1.0
 2101310343 metadata/md5-cache/www-apps/nikola-8.1.1
@@ -58177,8 +57703,9 @@
 2101310343 metadata/md5-cache/www-apps/prewikka-5.2.0
 2101310343 metadata/md5-cache/www-apps/radicale-2.1.11-r1
 2101310343 metadata/md5-cache/www-apps/roundup-2.0.0
+2102011839 metadata/md5-cache/www-apps/Manifest.gz
+2102011839 metadata/md5-cache/www-apps/nextcloud-20.0.5
 1703072138 metadata/md5-cache/www-client/fetch-1.0-r3
-2101071739 metadata/md5-cache/www-client/firefox-bin-84.0.2
 2101131239 metadata/md5-cache/www-client/uget-2.2.1
 2101231224 metadata/md5-cache/www-client/dillo-3.0.5-r3
 2101231224 metadata/md5-cache/www-client/dillo-3.1_pre20181005
@@ -58238,7 +57765,6 @@
 2101310343 metadata/md5-cache/www-client/elinks-9999
 2101310343 metadata/md5-cache/www-client/epiphany-3.34.4
 2101310343 metadata/md5-cache/www-client/epiphany-3.36.4
-2101310343 metadata/md5-cache/www-client/firefox-84.0.2
 2101310343 metadata/md5-cache/www-client/firefox-85.0
 2101312309 metadata/md5-cache/www-client/httrack-3.49.2-r2
 2101310343 metadata/md5-cache/www-client/pybugz-0.13
@@ -58247,8 +57773,10 @@
 2101310343 metadata/md5-cache/www-client/qutebrowser-1.14.1
 2101310343 metadata/md5-cache/www-client/qutebrowser-9999
 2101310343 metadata/md5-cache/www-client/seamonkey-2.53.6
-2102010909 metadata/md5-cache/www-client/Manifest.gz
 2102010109 metadata/md5-cache/www-client/firefox-78.7.0
+2102020109 metadata/md5-cache/www-client/Manifest.gz
+2102011809 metadata/md5-cache/www-client/firefox-85.0-r1
+2102020109 metadata/md5-cache/www-client/opera-developer-75.0.3953.0
 1910071209 metadata/md5-cache/www-misc/profile-sync-daemon-5.75
 1910090839 metadata/md5-cache/www-misc/profile-sync-daemon-6.35
 1904231239 metadata/md5-cache/www-misc/wsmake-0.6.4
@@ -58443,8 +57971,8 @@
 2101310343 metadata/md5-cache/x11-apps/igt-gpu-tools-9999
 2101310343 metadata/md5-cache/x11-apps/xisxwayland-1
 2101310343 metadata/md5-cache/x11-apps/xisxwayland-9999
-2102010309 metadata/md5-cache/x11-apps/Manifest.gz
-2102010309 metadata/md5-cache/x11-apps/xinit-1.4.1-r1
+2102012109 metadata/md5-cache/x11-apps/Manifest.gz
+2102012109 metadata/md5-cache/x11-apps/xinit-1.4.1-r1
 2005190009 metadata/md5-cache/x11-base/xorg-drivers-9999
 2012150109 metadata/md5-cache/x11-base/xorg-drivers-1.20-r2
 2012150109 metadata/md5-cache/x11-base/xorg-x11-7.4-r3
@@ -58452,9 +57980,9 @@
 2101310343 metadata/md5-cache/x11-base/xcb-proto-1.14.1
 2101310343 metadata/md5-cache/x11-base/xorg-proto-2020.1
 2101310343 metadata/md5-cache/x11-base/xorg-proto-9999
-2101302239 metadata/md5-cache/x11-base/xorg-server-9999
-2102010309 metadata/md5-cache/x11-base/Manifest.gz
-2102010309 metadata/md5-cache/x11-base/xorg-server-1.20.10-r1
+2102012109 metadata/md5-cache/x11-base/Manifest.gz
+2102012109 metadata/md5-cache/x11-base/xorg-server-1.20.10-r1
+2102011809 metadata/md5-cache/x11-base/xorg-server-9999
 2012231444 metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.5.0
 2101231224 metadata/md5-cache/x11-drivers/nvidia-drivers-390.138-r5
 2101231224 metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r7
@@ -58777,7 +58305,6 @@
 2101231224 metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r2
 2101231224 metadata/md5-cache/x11-misc/3dfb-0.6.1-r1
 2101231224 metadata/md5-cache/x11-misc/accessx-0951-r2
-2101231224 metadata/md5-cache/x11-misc/albert-0.17.2
 2101231224 metadata/md5-cache/x11-misc/alock-1.0.0
 2101231224 metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r1
 2101231224 metadata/md5-cache/x11-misc/apwal-0.4.5-r2
@@ -59108,7 +58635,6 @@
 2101241809 metadata/md5-cache/x11-misc/util-macros-1.19.3
 2101271809 metadata/md5-cache/x11-misc/i3blocks-1.5-r1
 2101271809 metadata/md5-cache/x11-misc/i3blocks-contrib-1.4.0_p20201127
-2101312009 metadata/md5-cache/x11-misc/Manifest.gz
 2101310343 metadata/md5-cache/x11-misc/alacarte-3.36.0
 2101310343 metadata/md5-cache/x11-misc/arandr-0.1.10
 2101310343 metadata/md5-cache/x11-misc/compton-0.1_beta2-r1
@@ -59151,6 +58677,8 @@
 2101310343 metadata/md5-cache/x11-misc/zim-0.73.2
 2101310343 metadata/md5-cache/x11-misc/zim-0.73.3
 2101310343 metadata/md5-cache/x11-misc/zim-0.73.4
+2102012339 metadata/md5-cache/x11-misc/Manifest.gz
+2102012339 metadata/md5-cache/x11-misc/albert-0.17.2
 1908180209 metadata/md5-cache/x11-plugins/e16-epplets-0.16
 1905230009 metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
 1803190338 metadata/md5-cache/x11-plugins/pidgin-birthday-reminder-1.7-r1
@@ -59585,7 +59113,6 @@
 2101231224 metadata/md5-cache/x11-themes/xcursor-themes-1.0.6
 2101231224 metadata/md5-cache/x11-themes/xfce-gant-icon-theme-3.9_p6-r1
 2101231224 metadata/md5-cache/x11-themes/xxv-skins-1.6.1-r1
-2101241909 metadata/md5-cache/x11-themes/gtk-engines-unico-1.0.3_pre20140109-r1
 2101240209 metadata/md5-cache/x11-themes/lxqt-themes-0.16.0
 2101260209 metadata/md5-cache/x11-themes/light-themes-17.04_p20170406-r2
 2101260209 metadata/md5-cache/x11-themes/light-themes-19.04-r2
@@ -59595,8 +59122,9 @@
 2101310343 metadata/md5-cache/x11-themes/gnome-backgrounds-3.36.0
 2101310343 metadata/md5-cache/x11-themes/gnome-backgrounds-3.38.0
 2101301509 metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r100
-2102010909 metadata/md5-cache/x11-themes/Manifest.gz
 2102010809 metadata/md5-cache/x11-themes/greybird-3.22.14
+2102011839 metadata/md5-cache/x11-themes/Manifest.gz
+2102011839 metadata/md5-cache/x11-themes/gtk-engines-unico-1.0.3_pre20140109-r1
 2010121339 metadata/md5-cache/x11-wm/e16-1.0.21
 2011261339 metadata/md5-cache/x11-wm/oroborus-2.0.20-r1
 2101171809 metadata/md5-cache/x11-wm/e16-1.0.22
@@ -59807,4 +59335,4 @@
 2101302009 metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.1
 2101310343 metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.12
 2101310343 metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6-r3
-2102011409 metadata/md5-cache/Manifest.gz
+2102020909 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2caf13dabb48..d9a3ad651214 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Feb 2021 11:30:01 +0000
+Tue, 02 Feb 2021 06:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 68ecb6d344e8..82f63aa410ec 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-f72277e8cf68a3b6785de134af188b78bcbf60d1 1612176906 2021-02-01T10:55:06+00:00
+cb17331e572202ca4465b0a3982ecc258a4a06dc 1612245385 2021-02-02T05:56:25+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 7ad9c107253d..1f877b4b6f74 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1612177501 Mon 01 Feb 2021 11:05:01 AM UTC
+1612245901 Tue 02 Feb 2021 06:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index c99e3d09773c..c1cf5c28dd4e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Feb 2021 11:08:24 +0000
+Tue, 02 Feb 2021 06:08:27 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 7af71f6e4ad0..f405f46ee214 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/gensink/Manifest b/net-analyzer/gensink/Manifest
index 8823daf3cd36..69370fe296bb 100644
--- a/net-analyzer/gensink/Manifest
+++ b/net-analyzer/gensink/Manifest
@@ -1,4 +1,4 @@
 AUX gensink-4.1-make.patch 140 BLAKE2B 77902ad078dc995fcbe677ba96cc5dd1b69e174d5bf8e7f0279663083ea8532f8fe0d6f4e2e65ed6c71b680b2b90620eb35ac5f1ecda583b66e64b25b0995ab2 SHA512 c8871a2a1cecf9cb8c2c1d4d6905bc6a4df29d5741e1c4f0691d38c68619f159739b2e0c9a0fa1535cf195fd97bd0dc9ed2accc71ea92edd5ca9be2ff12d025d
 DIST gensink-4.1.tar.gz 12352 BLAKE2B 024f65d0a0a5c4b23ca8e3b8d7f80b68888ff9eacbfa01028b2df8e2bafc7034837701a49aa6eeb5392a042029e6bf122c8d5c47c935e218830b902e5e36461d SHA512 5572c4df9b3c688f6a0f33c539bcdbd3c7b2a0992ba560907e0d22440176380cb6888732ab11ef4d6ced0c2d906ab494895a65c00a64db8603cbd1245d9c0d27
-EBUILD gensink-4.1-r2.ebuild 473 BLAKE2B 1c6eaa34141b204d25574d8c10f79235714d792c05ef8b907feec75ebe279cb7849649096027fa3c8fdf2808acd2c5a978fab6d888a5cc0f80bab6780faa553e SHA512 5c5f764567f5cbcb95a2876d662c1f23812115eee8216cbf2b7c5dd3aa32f23f6e962f794fda2cb855a35c2be118c8d4d062091e4c48f90049a0bc0bf1c3498c
+EBUILD gensink-4.1-r2.ebuild 466 BLAKE2B b0e612409fa266ce604b42d1456ddb2c23d22cd30ac71cce583f8f8898fe072403ded4b79c36af949bf37ccf41329902a992db0939c32f14b2b3db65658e5560 SHA512 1c4937fcd80eec93fa4eb0a7fe31be69b273069ca3dc9b81cfba7b33feb1629a7ebfcd740db3bac198b687300df6c12e4ee7faa778d63caf1c495fe1f295b345
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/gensink/gensink-4.1-r2.ebuild b/net-analyzer/gensink/gensink-4.1-r2.ebuild
index 5a99e658ec60..808eea74cb25 100644
--- a/net-analyzer/gensink/gensink-4.1-r2.ebuild
+++ b/net-analyzer/gensink/gensink-4.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit base toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A simple TCP benchmark suite"
 HOMEPAGE="http://jes.home.cern.ch/jes/gensink/"
@@ -12,7 +12,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 
-PATCHES=( "${FILESDIR}/${P}-make.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-make.patch"
+)
 
 src_compile() {
 	tc-export CC
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 1e6e12591cb3..5d637884c438 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -26,9 +26,9 @@ EBUILD zabbix-3.0.31-r2.ebuild 9301 BLAKE2B c015b9dc26dfa67ebfcd7aceb64112b6c6bb
 EBUILD zabbix-4.0.27-r1.ebuild 9275 BLAKE2B 5b65d2fef8b8be1a903a202185df86f78de46d3147e884749a899d7330a20488d7b5cd09021cda9224ec9664b55f65f85e18e436cacc586d332eb7f76c0bec56 SHA512 fbe2f7c21e7455644d77e79b4a3cfb5289f16cc0bff44a297b8fef362f347d8aff177453c4df86eb3c56e7931a7d5cdfe010e7ce4507b9a83d49b92f999e5456
 EBUILD zabbix-4.0.28.ebuild 9277 BLAKE2B ade8c37f772a5c18001b547b070422de3c77d783626e27f1324377e0e66786389c24a02bfe0e2654703bb5e337e29b7d5d5b652a595681f52cc23cec8930d5b3 SHA512 b24f23d30f4f8e01df08a5bfe79d5db773bcd4df6001dfdc7a177bfdbc31a04da5e739b98883069a9ecda96f93c6e2b4c16244517db694ec542a85137ae50697
 EBUILD zabbix-5.0.6-r1.ebuild 9144 BLAKE2B d874cb8c0f3c739719bff4fe7a374deafd032e6b103b2bad2ecd705c7163a7d741eb61317ccee951996f423bd61933831a1b8f38ace81c457d7633c911a94a09 SHA512 86ccf5eb4a46738c5015fc71e07622e26e53c4382fd394f898b30b7c433853578f8c1e087aecd7f1bfd87ad128e81686916ef05b0a9db199135b5b7182da6d9c
-EBUILD zabbix-5.0.7.ebuild 9146 BLAKE2B f36357a08eeba8ed1bd0ba191dc3410dac149537f89bedd2af780236a848b1b5b3942bfb1f175c69efbe1babeb3510176461a7442eed77c988b4190b64d34c6f SHA512 59a2fe89d93a3be7993399ebd34a927e671c23054b4505bbb6fd11d86be7bea6f6945d5b907ae68d8ebcd290c8758d4f5f6611cd6126d1e77a7b39bd03aa2b55
+EBUILD zabbix-5.0.7.ebuild 9145 BLAKE2B 20c81144ae559af07797460ca0e0a438fb09c6244fec12506873536d00b70a1e64c7c6892f784b69b150ca19fdf726dbc5632d39c72a5bc06008829ed28beee2 SHA512 0aeb42b4b38c18467772c646f57698d6e91518991b1d2fbd1038f3108e5d3547767784229c940c2724a4fdedeac5fd04bb49a153ca090602c2ea6a64f562ad9e
 EBUILD zabbix-5.0.8.ebuild 9146 BLAKE2B f36357a08eeba8ed1bd0ba191dc3410dac149537f89bedd2af780236a848b1b5b3942bfb1f175c69efbe1babeb3510176461a7442eed77c988b4190b64d34c6f SHA512 59a2fe89d93a3be7993399ebd34a927e671c23054b4505bbb6fd11d86be7bea6f6945d5b907ae68d8ebcd290c8758d4f5f6611cd6126d1e77a7b39bd03aa2b55
 EBUILD zabbix-5.2.2-r1.ebuild 9144 BLAKE2B d874cb8c0f3c739719bff4fe7a374deafd032e6b103b2bad2ecd705c7163a7d741eb61317ccee951996f423bd61933831a1b8f38ace81c457d7633c911a94a09 SHA512 86ccf5eb4a46738c5015fc71e07622e26e53c4382fd394f898b30b7c433853578f8c1e087aecd7f1bfd87ad128e81686916ef05b0a9db199135b5b7182da6d9c
-EBUILD zabbix-5.2.3.ebuild 9146 BLAKE2B f36357a08eeba8ed1bd0ba191dc3410dac149537f89bedd2af780236a848b1b5b3942bfb1f175c69efbe1babeb3510176461a7442eed77c988b4190b64d34c6f SHA512 59a2fe89d93a3be7993399ebd34a927e671c23054b4505bbb6fd11d86be7bea6f6945d5b907ae68d8ebcd290c8758d4f5f6611cd6126d1e77a7b39bd03aa2b55
+EBUILD zabbix-5.2.3.ebuild 9145 BLAKE2B 20c81144ae559af07797460ca0e0a438fb09c6244fec12506873536d00b70a1e64c7c6892f784b69b150ca19fdf726dbc5632d39c72a5bc06008829ed28beee2 SHA512 0aeb42b4b38c18467772c646f57698d6e91518991b1d2fbd1038f3108e5d3547767784229c940c2724a4fdedeac5fd04bb49a153ca090602c2ea6a64f562ad9e
 EBUILD zabbix-5.2.4.ebuild 9146 BLAKE2B f36357a08eeba8ed1bd0ba191dc3410dac149537f89bedd2af780236a848b1b5b3942bfb1f175c69efbe1babeb3510176461a7442eed77c988b4190b64d34c6f SHA512 59a2fe89d93a3be7993399ebd34a927e671c23054b4505bbb6fd11d86be7bea6f6945d5b907ae68d8ebcd290c8758d4f5f6611cd6126d1e77a7b39bd03aa2b55
 MISC metadata.xml 1518 BLAKE2B 3ec0ec6fcb2e8d92209689d685171ad4d97a81d89f60719cc1de88b88c0f91a86a5422359e84c665ed140b6dc764164a75177ac1cc2fa0d624599bcc050d057e SHA512 6a131659395d29c72126ea38648ec273c444497f592f830af6afb7791eff4063de1349059ae11917a3356c22b38f5ac954593394ab03b955183ae8011dd4b173
diff --git a/net-analyzer/zabbix/zabbix-5.0.7.ebuild b/net-analyzer/zabbix/zabbix-5.0.7.ebuild
index 37470326b6db..feec05de7f27 100644
--- a/net-analyzer/zabbix/zabbix-5.0.7.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
diff --git a/net-analyzer/zabbix/zabbix-5.2.3.ebuild b/net-analyzer/zabbix/zabbix-5.2.3.ebuild
index 37470326b6db..feec05de7f27 100644
--- a/net-analyzer/zabbix/zabbix-5.2.3.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index b0e35303e2d6..a5ef3ce0a1ca 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/pdnsd/Manifest b/net-dns/pdnsd/Manifest
index 71c0a6502eba..7388be544cbc 100644
--- a/net-dns/pdnsd/Manifest
+++ b/net-dns/pdnsd/Manifest
@@ -7,6 +7,5 @@ AUX pdnsd.resolvconf-r1 17538 BLAKE2B 0797bf3800e5ca1bf3d4c55cbd0862bb8a6964b5b1
 AUX pdnsd.service 269 BLAKE2B b14978db01ec729a6e04d4849a468fd45999c1fbd7d21e986b2034edb81f645df7f5ce8924d72e11b04a548c6957964c936442f1d57c5fa9a327667b331ce4f4 SHA512 c1504f52fb30ba197bd3c3450f200f2f274bf73f7a6436bc317ad9affc18e9c5edcb8555913a4aa9c6bf44b935e0c9cd005b4f5b0fd56eed6e11914f63db9ef2
 AUX pdnsd.tmpfiles 37 BLAKE2B c4da53c3d0ebea88e456e6ea07b2505ed187e074286bb40fabde6a27c4cc017dabea3207e8fde80aa3fe38957b12ce8e09c809b369f06356c1737ae0825cdbff SHA512 7beacc66e8504ca0f8e613dfc8ed2479362f1ebc98ffab902622b36c795fe75e176d9f0a330ad74e10a7f7b1597cce068d94eea6511a75b941e42b2458b76df5
 DIST pdnsd-1.2.9a-par.tar.gz 516061 BLAKE2B 33f2fa85f4b2fa3b709e612c12c8a6edff67f3d2203a8ccd9e838f72b8ab2664eb2e88c0957c08c64568581d9eeb4bede9157ba0928fa6d28ccca279f71fbd1a SHA512 4fde296642306aa986ddb7cad0b5991bcd397656d93ef4962706276848c7fa62c664a40198e807d029637f116e8000c237d98b91cbbfec5c08b134d8bb3adf81
-EBUILD pdnsd-1.2.9a-r1.ebuild 4066 BLAKE2B ada2c3ef181876904cce8d248012f6bd233c7d8755a29b83c3c480b5db6e4e0c54a097d0ae6ac4a0d4fe33910cfe8aeb6215e420d4fa4d5651908f8a791d7b39 SHA512 9aa45f1945e2864b2d210aabe222c6f9edf56157750360908621e7f2ce725d147060f9698882dd3b288546a9b35a4c914ba1704b37e6567da3394e6368a280dd
 EBUILD pdnsd-1.2.9a-r2.ebuild 3250 BLAKE2B 1f51cde2448d53f074ae169c0364446eb8a6ba230c53adf246dd45aa745a625ddb33928daeda676d0bf3434c4b8800447b79e5d5951cac4007cc83eba71a2a1f SHA512 a33a4ff359e74860683b06fa933e9b0863aabf9390e46168d28b2a7bd8ad0d14c3c7e75c022d1f35f24fd0359a788712baa26f78cfe081d86dace0a83f6260ec
-MISC metadata.xml 814 BLAKE2B 2f0e173648d270958a54e378a0638936666c958f69768047e24d4d6cd03d9f52d89940cf57fb346d27fd2806c6ea6be378ff4d950161d475f1f0a0eac0fe206f SHA512 b5bca37d42c4c50031a968297332e824e2830481903ae4036347ffbf554a0a37efb582d8a52b6bba48a0566db81942b1052aca5ed16bbe248fcec46ea99090a8
+MISC metadata.xml 690 BLAKE2B b0622b07b0bde244e72fda490d314bfc9741a9e543d2d28454bb318974c05482b0f35b3ec84e200ad44028315dacb36a733d58a854d92ffa5fddbdc5d8c06367 SHA512 d206ddb764115a80a423255760eb5d82f842cecde6318be38a8d0b7121b2c893b0eff6687837965b9058b53c4e24245a349dbfe91ee0b18e8e3482b0aa623fe8
diff --git a/net-dns/pdnsd/metadata.xml b/net-dns/pdnsd/metadata.xml
index 1198baddd17c..b2ffc78b5c94 100644
--- a/net-dns/pdnsd/metadata.xml
+++ b/net-dns/pdnsd/metadata.xml
@@ -12,10 +12,6 @@
     networking).
   </longdescription>
   <use>
-    <flag name="isdn">
-      Linux-only: check status of ippp interfaces with ISDN-specific
-      system calls.
-    </flag>
     <flag name="urandom">
       Linux-only: use /dev/urandom (pseudo-random number generation)
       instead of the default use of random() PRNG.
diff --git a/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild b/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild
deleted file mode 100644
index 5a05f498a8b3..000000000000
--- a/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit systemd user
-
-DESCRIPTION="Proxy DNS server with permanent caching"
-HOMEPAGE="http://members.home.nl/p.a.rombouts/pdnsd/"
-SRC_URI="http://members.home.nl/p.a.rombouts/pdnsd/releases/${P}-par.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
-IUSE="debug ipv6 isdn +urandom test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="test? ( net-dns/bind-tools )"
-
-pkg_setup() {
-	enewgroup pdnsd
-	enewuser pdnsd -1 -1 /var/lib/pdnsd pdnsd
-}
-
-src_configure() {
-	local myconf=""
-	use debug && myconf="${myconf} --with-debug=3"
-	use urandom && myconf="${myconf} --with-random-device=/dev/urandom"
-
-	econf \
-		--sysconfdir=/etc/pdnsd \
-		--with-cachedir=/var/cache/pdnsd \
-		--with-default-id=pdnsd \
-		$(use_enable ipv6) $(use_enable ipv6 ipv6-startup) \
-		$(use_enable isdn) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog* NEWS README THANKS TODO README.par
-	docinto contrib ; dodoc contrib/{README,dhcp2pdnsd,pdnsd_dhcp.pl}
-	docinto html ; dohtml doc/html/*
-	docinto txt ; dodoc doc/txt/*
-	newdoc doc/pdnsd.conf pdnsd.conf.sample
-
-	newinitd "${FILESDIR}/pdnsd.rc8" pdnsd
-	newinitd "${FILESDIR}/pdnsd.online.2" pdnsd-online
-	systemd_newtmpfilesd "${FILESDIR}/pdnsd.tmpfiles" pdnsd.conf
-	systemd_dounit "${FILESDIR}/pdnsd.service"
-
-	mkdir "${T}"/confd || die
-
-	cat - > "${T}"/confd/pdnsd-online <<EOF
-# Make sure to change the rc_need variable to the service for the
-# interface that connects you to the dns servers.
-#
-# For instance if you use a PPP connection on ppp0 to connect, set
-#   rc_need="net.ppp0"
-
-rc_need="net.lo"
-EOF
-
-	# Don't try to do the smart thing and add the --help output here:
-	# it will cause the file to be etc-updated if the help text
-	# changes and fails when cross-compiling.
-	cat - > "${T}"/confd/pdnsd <<EOF
-# Command line options, check pdnsd --help for a list of valid
-# parameters. Note that most of the options that can be given at
-# command-line are also available as configuration parameters in
-# /etc/pdnsd/pdnsd.conf
-PDNSDCONFIG=""
-EOF
-
-	doconfd "${T}"/confd/*
-
-	# gentoo resolvconf support
-	exeinto /etc/resolvconf/update.d
-	newexe "${FILESDIR}/pdnsd.resolvconf-r1" pdnsd
-}
-
-src_test() {
-	fail_kill() {
-		kill -9 $(<"${T}"/pid)
-		die "$1"
-	}
-
-	mkdir "${T}/pdnsd" || die
-	echo -n -e "pd12\0\0\0\0" > "${T}/pdnsd/pdnsd.cache"
-	IPS=$(grep ^nameserver /etc/resolv.conf | sed -e 's/nameserver \(.*\)/\tip=\1;/g' | xargs)
-	sed -e "s/\tip=/${IPS}/" -e "s:cache_dir=:cache_dir=${T}/pdnsd:" "${FILESDIR}/pdnsd.conf.test" \
-		> "${T}/pdnsd.conf.test"
-	src/pdnsd -c "${T}/pdnsd.conf.test" -g -s -d -p "${T}/pid" || die "couldn't start daemon"
-	sleep 3
-
-	find "${T}" -ls
-	[ -s "${T}/pid" ] || die "empty or no pid file created"
-	[ -S "${T}/pdnsd/pdnsd.status" ] || fail_kill "no socket created"
-	src/pdnsd-ctl/pdnsd-ctl -c "${T}/pdnsd" server all up || fail_kill "failed to start the daemon"
-	src/pdnsd-ctl/pdnsd-ctl -c "${T}/pdnsd" status || fail_kill "failed to communicate with the daemon"
-	sleep 3
-
-	dig @127.0.0.1 -p 33455 localhost > "${T}"/dig.output 2>&1
-	cat "${T}"/dig.output || die
-	fgrep -q "status: NOERROR" "${T}"/dig.output || fail_kill "www.gentoo.org lookup failed"
-
-	kill $(<"${T}/pid") || fail_kill "failed to terminate daemon"
-}
-
-pkg_postinst() {
-	elog
-	elog "Add pdnsd to your default runlevel - rc-update add pdnsd default"
-	elog ""
-	elog "Add pdnsd-online to your online runlevel."
-	elog "The online interface will be listed in /etc/conf.d/pdnsd-online"
-	elog ""
-	elog "Sample config file in /etc/pdnsd/pdnsd.conf.sample"
-
-	# The tmpfiles.d configuration does not come into effect before the
-	# next reboot so create the cachedir now.
-	local cachedir="/var/cache/pdnsd"
-	if [[ ! -d ${cachedir} ]] ; then
-		mkdir ${cachedir} || eerror "Failed to create cache"
-	fi
-	chown pdnsd:pdnsd ${cachedir} \
-		|| eerror "Failed to set ownership for cachedir"
-	chmod 0750 ${cachedir} \
-		|| eerror "Failed to set permissions for cachedir"
-}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 7dba66f6f0e2..95cf693a3607 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/davfs2/Manifest b/net-fs/davfs2/Manifest
index 83adf20c4d34..e60c0f4070f1 100644
--- a/net-fs/davfs2/Manifest
+++ b/net-fs/davfs2/Manifest
@@ -7,5 +7,5 @@ DIST davfs2-1.6.0.tar.gz 472511 BLAKE2B aed1ec060d5639fb90a58257038a75c25c2f77a7
 EBUILD davfs2-1.5.4.ebuild 961 BLAKE2B f0c89f050a3dda0e73e42b118cf346bf82cf8d1f86e749076752f6112221d3b1cfd301b58e2bd78b76df4c7f2acebd8c852445f7f330b07d86fc97eb5b07c8fb SHA512 091a3ecccad50cce164b486d827c47d9eaf01457cfa661e71351e3f7de0e4a93c95484be19aab37701f14511286a06ded54da5863211102c86def249135739eb
 EBUILD davfs2-1.5.5.ebuild 1211 BLAKE2B b3bcaf6f15c6c0beb5c1648ade215113506d60472dbe0b7fe2935e4c19d0b08dcdde16a3171c455870d6ea0737300eb42d92e0096e0baf6b6c1787eb05c6fafe SHA512 9e9ad73032913cc922f15884e70f1a2e5c0120ce0117e8a2c6fabfeb73df1f32631f17f1ab49cb6b28246efd4d2482620c76a851fb97761ab3c44f9f0086d46b
 EBUILD davfs2-1.5.6-r1.ebuild 1314 BLAKE2B ef9f5e670563a3ab72c3dfc75017a4f240622beb6c00c275d2e57ef4119b30e226b9e823e5b4c660de95db422b1c81b0b3176b935b6fe187eb7525556ef94e0d SHA512 8771bdca97c94164606881acd0145368f74ca2337186ea09fece428937992aefbf3f81ad13e595cf03407d59e0879eae7127711b91fa405069e7dc6e6d3483cd
-EBUILD davfs2-1.6.0.ebuild 1217 BLAKE2B 3eaa6e17d6b883b78a65b6efdab98376094c034802be7286bed6810c655dfdf7da1768b3153a6b3f0398f70a07e4b9854fcce21acb3503a131ca317d5ee33769 SHA512 3d94820b246aaf8550d48b1631e2ffb8f0ea2f2c08b192482aa98d4d83c809befe68f20f2ce71222871741253fb8b945116664cbad02c4eed20cbb62f98b7de9
+EBUILD davfs2-1.6.0.ebuild 1216 BLAKE2B 00b070460c2d604d9fe24e9c9911dda4541910c618b39c8dcd1078a9e1d4f77ee2c45f5b9b13d2a84bcbe62826d9322ca47b5213fda270a8b39bc368938ff894 SHA512 955d23cad9b3715513953b09ae274d2bf7c78c5c71e5a44252fe94cdf92502fc74aed0a869bba6adaf8808b5ad5a6e19b42e4b6cb860a2429daec1c000dd01e3
 MISC metadata.xml 251 BLAKE2B 50ac338c9f09535de32ea2a1300195c358edff81cc3517de13846dbbc8b34331fa634e33633828beefb727a53bce0299ed784f4d0e18c07c977abfcfdd312074 SHA512 6d9ef84f36e3ce79747ee806d0194543d1c5a004e612ecbe308644829cf03234d7f52ef0dbbe57144da5d4af86e3a9a5df297a01c95c4d9938f49605e92aea32
diff --git a/net-fs/davfs2/davfs2-1.6.0.ebuild b/net-fs/davfs2/davfs2-1.6.0.ebuild
index d7025a0786b9..f967945cae1e 100644
--- a/net-fs/davfs2/davfs2-1.6.0.ebuild
+++ b/net-fs/davfs2/davfs2-1.6.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 IUSE="nls"
 RESTRICT="test"
 
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index b5ddfe630fd0..cfc1e27354e5 100644
Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ
diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest
index 0507c3a937e9..8d3ac196950f 100644
--- a/net-ftp/atftp/Manifest
+++ b/net-ftp/atftp/Manifest
@@ -7,5 +7,5 @@ AUX atftp.service 233 BLAKE2B 4c9a1a8041ffc4cdf71a24800494f340121beb9bde9760fa09
 AUX atftp.service.conf 45 BLAKE2B dd52bd3ef0d72f28d2e317282026d354b6023f8b51634d0374623c782afacae1284f5385967dfa91026553845f9283be59b4c7d96031da85261067b7be6544f7 SHA512 661befb6873eee6c0ed25fd5cb156e3d7c4ef801d2f58cda8df0f0c5fd851c7eb28089a9399529164c61505963e9d10143df2195d57ff66f85ad0e2750fbbd57
 DIST atftp-0.7.2.tar.gz 248038 BLAKE2B 3ca44624bf989009c2ebd0ae97927b0784e3c617a79a1bd00212a72a185302cf84f51c8bcda2012981d67cfed4d241b70f8719e78155207608f07a2227e6c437 SHA512 d602bb69451175a36e619abcff412ab1f6d0e7baf8c3f9a2b32081530fbc5816157404b80d42a8b6caa89cc83675b5cbeefcd57a5d98b8f5b43c6254b20ef28b
 EBUILD atftp-0.7.2-r2.ebuild 1494 BLAKE2B 1b360f602465ee0dea30a42151ec36cb3d0b918d80dad948b25ee2851f994586cbaecdc893e75d4d782a785ae1769188944581aa84b2e4087f2550b4186caee8 SHA512 4f11fd15e3b4504a973b07c70383f1e9edfd16e5a42b824eda20e63fc6bf87c96439a91c1cf68fbfcc8a914dfbb0a9bc52992b3b30e1fd1a0ccf620d89297553
-EBUILD atftp-0.7.2-r3.ebuild 1537 BLAKE2B 1e56e24731a2f43d58b6a819c8f561c2669240fc87553d1d187047f0d27303a785828b7d0c976d5eb32d76c2c76c7277158d77369e71d66c0f3ea5315bc81d3c SHA512 0208bfc439df1b605bbdb8aeb5d91fea46c45196cb5417340f636f1c149e606ab06f2eb75c8dd57ee5bdb7b44336ff44eeec7cac282ce0c9622cfd2ad7dc3897
+EBUILD atftp-0.7.2-r3.ebuild 1535 BLAKE2B b379db6331f3149ed43af2cea7dbb43a00e11362cdb14dfcb8cee14a26fe3a20eefd3c240d164f5c1e6b9f2d5b714eae63c8009f2b569916bb125d642905d176 SHA512 1600089fd9b4dc644ac7f3b9d26a0f80754a01bf6d1b757fdb9e2703357851f07367a160cbfd3a94caec971e388cf4b91e2deae8f2b7527b7f448fad3be7c33b
 MISC metadata.xml 418 BLAKE2B 882119fa041eaa33650c5e3efaa440e3ed25056f05dda4667a150a8646f32f620b3479821b0e6c3220541afd811f35b6060127aa58b98e7604fc498536e8c724 SHA512 cff57d66fe14a48905bd9280e15f794a66df58f83fff73290db3dc7a8d2196c5ffba05693d9e8909e3bf710bb05b72e00001747bd9d92379a7cdfc0dbaba57cb
diff --git a/net-ftp/atftp/atftp-0.7.2-r3.ebuild b/net-ftp/atftp/atftp-0.7.2-r3.ebuild
index 0b2c1e633f95..f6d21abd02da 100644
--- a/net-ftp/atftp/atftp-0.7.2-r3.ebuild
+++ b/net-ftp/atftp/atftp-0.7.2-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/atftp/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ppc64 ~s390 ~sparc ~x86"
 IUSE="selinux tcpd readline pcre"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index dd915ee81173..a88b95beff59 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index 656b5a87cdba..95d2f4746b1e 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST element-desktop_1.7.16_amd64.deb 69195686 BLAKE2B 76336e2f19def401b3472022e40741853a0ffdd180fe8161fae4cb9e8c687742bc41ce0e74eec19f125c5c2f135f0ceba838ae88c2aace65ad665cf832fc8858 SHA512 ae02a2fb9b55d7a424d8e9a2c74476802bef5afef04779cd8e6651bdf1a95f0c5fed04a292f5d72c82c12e88db65d0f5a613c309542a77de22a1195bf5ec4471
-EBUILD element-desktop-bin-1.7.16.ebuild 1756 BLAKE2B 38263e9a6b73cb8c4137e14971a5ef4812e3122cdcb0dd6f7908824f052b1c4f198ea987d5528eba089193976ce6212f0aca498e227d6206247b9d0e95102322 SHA512 8889e14c06b17da6af08ddbb01cef5208a14d1cfcf796587aa1a78374994de7a61f1770a0b485f04db6ce839ea9052d19c318ca1b07e00ff15fa4eeeb88415f3
+DIST element-desktop_1.7.18_amd64.deb 69307090 BLAKE2B 70ab1e8c13ef2df80c0bc1e8f63f4cc8c0715f38274400915b41d701baf2053df796327177784558df8a209e9c22777625233ebb6f0b7061df0cefa0ea87ed66 SHA512 12e7d876f4c1d3d4cbd47ca67d215218d7613d4e751b23e3223aa010d228ca9b6f59c8b905317c92078eee4ecb15c1f1c94b71d6e8f4de8a6200374cd5ae5846
+EBUILD element-desktop-bin-1.7.18.ebuild 1756 BLAKE2B 38263e9a6b73cb8c4137e14971a5ef4812e3122cdcb0dd6f7908824f052b1c4f198ea987d5528eba089193976ce6212f0aca498e227d6206247b9d0e95102322 SHA512 8889e14c06b17da6af08ddbb01cef5208a14d1cfcf796587aa1a78374994de7a61f1770a0b485f04db6ce839ea9052d19c318ca1b07e00ff15fa4eeeb88415f3
 MISC metadata.xml 349 BLAKE2B 28ef90d142ba536df4df0e57bc4b9dd3ea565b038bebefe71c2a2d9325761625922f928707a99833e3edb4cd2bb8083757b02ad81abc620571d4eb3620df72c1 SHA512 20596473ae86afc73bf80be067fdc7104ba8fcea6aa319e5fcc26397612dad2a724876a5748babff0f13f020d2bd246ae24f9805c8db9da70e86ae52ea3dc61e
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.7.16.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.7.18.ebuild
similarity index 100%
rename from net-im/element-desktop-bin/element-desktop-bin-1.7.16.ebuild
rename to net-im/element-desktop-bin/element-desktop-bin-1.7.18.ebuild
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 3c0d5dcdacae..42db0c914dc5 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
index a21ebb5d765d..5faf8f0a020d 100644
--- a/net-libs/libgsasl/Manifest
+++ b/net-libs/libgsasl/Manifest
@@ -4,7 +4,7 @@ AUX libgsasl-1.8.1-gss-extra.patch 855 BLAKE2B 68eb983dee51393b4d871b71932a61c88
 DIST libgsasl-1.10.0.tar.gz 1854755 BLAKE2B 691c143ece57b0b895f17ff3bfce8e216adb2ffcc7f6058501626b7b2e83d9eb0a85a036b6c7978b10eefbc94aab7b191e056341732d155597be5037e527b0e0 SHA512 33a8ea43be90a00fcda1b099ced8086b2ef9f72ee0dbce07bca04c944fa2d17588b6e5a32b7ab4ffeaf7ee695f9c84d3eb89c757c71934300d35580e423196dd
 DIST libgsasl-1.8.0.tar.gz 1208417 BLAKE2B 03eea4be45ccc28bbc5c98b5f266552e6f5da151dfc561b1f01dac107a6edf0f06a3000e868c07d5539df33334d3c965c6c276de30c75038e25165aa7e2db2e8 SHA512 7e591d12404919559bf67590f862270ffcae2030a14097cdaf92820aa79619b3048541e9f83b3fcb98a84622c44a52ecaceeebb1be55b9e9f68fb1790ade8721
 DIST libgsasl-1.8.1.tar.gz 1791261 BLAKE2B bd8b954f9d950fe449fe140baca840a14f12ef6318e74a6fd070b35504b8c3a7002f13fe93142bce992e4a1df773ebaad4ec01d04c01c63a7374187a8142136b SHA512 52bda3a962a2cbb598009fd02c547a4f8b5b9a4243511aa8104df97b4737023281ab57dbbcf839db3cad73c64cbc72bbd89b49da8b0379dd635220ffb642aa22
-EBUILD libgsasl-1.10.0.ebuild 1425 BLAKE2B 52860b2fc946c60d0761bc7b608f80c0ece0044df0838497a7f91c596f46f24f1e519c5775f76815287f441817f58a21f39298a6577280086ac4fe8ca9c05e1f SHA512 962215ca7b440c68c88c5d8fd68d54f5a103715bb22b280bb76820acc68c73104202a0dca5970f5bce5675999de1a798320bd8fce5901064facee5a82a1d6813
+EBUILD libgsasl-1.10.0.ebuild 1421 BLAKE2B 1e789ab47df7a948a53778cc56f1cd43354e2b7fdffe98dd0612f70fbcd2a2f0b761c770bddef176ef5c13a55163d99a8309acbbbccfe53d99754e1a9c7e9a81 SHA512 bd9b47d3ef9f3fa9c58c8aa806d2857dc398abe156b483933310eedc6ac7cb1e3001b7af608be5e65cf410decc3de8eaf56557036392db5be5f46393f33dcee4
 EBUILD libgsasl-1.8.0-r1.ebuild 1416 BLAKE2B 0c97b8c07c138f1a6f7194690ecfe830ac16bc838e1f402dba3cbbdb5f2efb3d9c5149537c6a678f60f944296dd349c81a6ad1179601b44fa2eb128879460b32 SHA512 a0d47502bf8d1c58895dbe8b2206c20b8608d23bab450ebcc8cc37a27c61c9c8289299331fb87112803177516437bae03295e363ac4628aa84480665122788c5
 EBUILD libgsasl-1.8.1.ebuild 1456 BLAKE2B 3c863f75eb71064fdebce7470393a1c752826fbedb49eeb60474ab8cde042f239f2d07ec9f829e84142824f6ce4cc2f91965a62f9ec8248ad14c5bbf1cd54f74 SHA512 4726cb82604704fa78df86f9df442de94cd5399bfbd91a0c0e4153298b073f76c1c315be3176ce15b28a77af9529d9e9d62a3bd296f49f7f5996cba34f6dee00
 MISC metadata.xml 366 BLAKE2B d144c8ef6b53c919ee09ebf2f3d4a7e8ab6528e4c3d9e01cd1de83dd92626f09b698f84020b7fcffb3cc67db8174d182bcf1aeed294e3f9765d5c5f02c27918b SHA512 acd5a38df05489c2bc01e25f1a246d23609513bc70ec07bee2cc87e0548d355197c05da7bfc26e70a2302317dd3345fd638930ee3436ffe7b6d4cd7ff8b101b0
diff --git a/net-libs/libgsasl/libgsasl-1.10.0.ebuild b/net-libs/libgsasl/libgsasl-1.10.0.ebuild
index 8340dee0fd78..d56373a25fd8 100644
--- a/net-libs/libgsasl/libgsasl-1.10.0.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="idn gcrypt kerberos nls ntlm static-libs"
 
 DEPEND="
diff --git a/net-libs/libnetfilter_log/Manifest b/net-libs/libnetfilter_log/Manifest
index 0fedf04f2442..62c31757c088 100644
--- a/net-libs/libnetfilter_log/Manifest
+++ b/net-libs/libnetfilter_log/Manifest
@@ -1,3 +1,3 @@
 DIST libnetfilter_log-1.0.1.tar.bz2 262545 BLAKE2B 4dcc7ff5deef95fc657a956556a1ff389cddaae3eaabed9c77cb7028793d5a0e377d2d02d55000ec853300b94164943436d658f42344a6314432b2f8f965fb8e SHA512 4088b9bf055fb4cd5f2e201a46a00def7642116b5d1695a371936b7b45eb93877944456506b45761bf2f3f81b40c161c1ecdcfb90532009f073dac3cedc6f436
-EBUILD libnetfilter_log-1.0.1.ebuild 681 BLAKE2B e7f658638de9ba2cb09e8b9921b85c256c12fc714a96f9f142c36d61036d508a15f5a8a79dbe966c11991abe22c84f5082def8d45506db063ff482467b43db54 SHA512 11e535861cd11c58831b5ec8994b1a8efd9b173754aadd8f75411c59d1a1ac696b56ac08ae02f58d2d90c84d4ac1060fd0964c5a4cf6dd745a6f56b530813f52
+EBUILD libnetfilter_log-1.0.1.ebuild 698 BLAKE2B 0a7e2a46937aa4af09e9b2f4dfa065c0959e98c12565d6d1752a8646fcffe097dd1b94ad8e557af8fe607270fa28574967fecb2cca1c6246553689136a163a9e SHA512 74fa5f513863714ea9f372e486f7f0c9aa88e8d72ad8043cd1b9c2d2e65cfb8251b5eb7a29758e06f4f74ec80be57c1136d42cc54623e2dcef77d9146c0cc1bd
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild b/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild
index f167de5d796d..97c5799a684b 100644
--- a/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild
+++ b/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild
@@ -1,24 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit linux-info autotools-utils
+EAPI=7
 
-DESCRIPTION="interface to packets that have been logged by the kernel packet filter"
+inherit linux-info
+
+DESCRIPTION="Interface to packets that have been logged by the kernel packet filter"
 HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_log/"
 SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
-IUSE="static-libs"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND=">=net-libs/libnfnetlink-1.0.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 CONFIG_CHECK="~NETFILTER_NETLINK_LOG"
 
+src_configure() {
+	econf --disable-static
+}
+
 pkg_setup() {
 	linux-info_pkg_setup
 	kernel_is lt 2 6 14 && die "requires at least 2.6.14 kernel version"
diff --git a/net-libs/libprotoident/Manifest b/net-libs/libprotoident/Manifest
index 47ab0a7bbac8..73d44deb63ad 100644
--- a/net-libs/libprotoident/Manifest
+++ b/net-libs/libprotoident/Manifest
@@ -1,8 +1,4 @@
 DIST 2.0.14-1.tar.gz 548297 BLAKE2B 1ebee48a18b798895171152f0e56e93520d39ffd7a18f025638bb2a115fded07c76db5b1110b93c4c7e2191f5c1a6043d42ce4862d6ee30914d3a47ab225b1f1 SHA512 2026f55ccc2cbf80f11c81c8d05e23f035ed8eb0b61443d9723b0d6d37a6befe989941043b7352761ff9cc744076b3d1ee36ffe971e4bca59b8f7d4a8a1c6d94
-DIST libprotoident-2.0.12.tar.gz 571466 BLAKE2B 604dee2d33f7944615211ee3ab0a3ba610354bd604bcbf5296d58698ab963b5e667ea3e08fc2df62dfdb1e7dc7a336a57be6e61b6f410fdd7a96f3b46c35d70c SHA512 b8ba13ce9286a026062f47ffe3bf9407b408f64fbf0521aeebaf0e39e6ddf70cfbc6574f8e9c0f35fc2c2e5f9c4e71e200536665988f88c65bbdbeb9b7baed16
-DIST libprotoident-2.0.13.tar.gz 592008 BLAKE2B b8e4ecf5fdc1b40881709e9a572148e666f6d1a56c00cca39efd81caba3c3344a57bbc57e0794a92d1ec23bac3c928ac2b06323c1785cb8fc08cb33f55f2195c SHA512 905c97ba3f994d7b63c95ee80bc7b2c2be13b86745d072f5aecb4df88f791c02dcda3f851f01b5cca3cd36ad87379759789238a8c05f3209a5aad3d854e6ff20
-EBUILD libprotoident-2.0.12.ebuild 758 BLAKE2B 0b86438b2f02429b945a71504d728efc59f1291cc764a3f30b21f91c4759e70d7c11ef494a9d17c59d72b27ebbe153802597300c4a4a0686548b36ef8badb895 SHA512 b2c96e2057350193ab29aaf37d0a04275eb1270fb3f76674a073bb23e5d43485648ef9945e77fbdcbfd8dc8c1c568e5a0ba1391ede5bb47a3cf3d00265364e7e
-EBUILD libprotoident-2.0.13.ebuild 755 BLAKE2B bb6a60f761e7e0aaf4990ac71b1a7fed86f10028df8829db8ddb43d196d617732648e7c93c8ce7a6cc98253f74a0c67f0cd7cf1868d0c789e891a37361769e5c SHA512 e52dd8c021325e157c632cbbf4c157322d8e777a2b2b0759811097b11a924ab4bb76f1be3f6899b5a042c6fd0710130407b32bbff52a542ace03ed8431a9771c
 EBUILD libprotoident-2.0.14_p1.ebuild 807 BLAKE2B 6bf2c3b242e412d0f551c238e0dd10e0973bfc7f779bdef50acb8d2edbb93c325723ba1d45cc61b17a3c795b253c00b57c1b5075b1279c3e2cedd1eb143b67c8 SHA512 7fd175f9607035017838e3536cc71310078503293dbb96766cb78317b532116599a0f6804bd94d90cad5f40a73d36b63c5c145f084cf9713b2cf10e9d3e5168a
 EBUILD libprotoident-9999.ebuild 783 BLAKE2B 6cc2e12379d71d21a3031969cca20dfadc9d256eaeddf65b67fcf88e33b3a4f3ebbd8def18755e46d337f69ad9927e8e2fbd4b0229d18e2af79c8dc3e5a3a4fd SHA512 4adfded1639d62cd0b5d8ab7685dd1e74a0cd3c65d56d86282fad7a3421be57fabd8361da7c6359763b8fc63069eced42864a9a4253bf10417b4521d131cf938
 MISC metadata.xml 360 BLAKE2B 17e614f06987241150e84b3738ef722bf680c8a9601307140767b78500a709849e71242774ecaa9c423771331365b4ba9e4293a859365527bfe11031339d91a7 SHA512 3de118bb358e064950487fffd58a49bb2fd5fc6597e6f3d0bf96a93d955e4879727fae386bdaf1a4a89388e471217903ce92b520edf257e1d1e66a6099e04b37
diff --git a/net-libs/libprotoident/libprotoident-2.0.12.ebuild b/net-libs/libprotoident/libprotoident-2.0.12.ebuild
deleted file mode 100644
index 12543b4187b1..000000000000
--- a/net-libs/libprotoident/libprotoident-2.0.12.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils ltprune
-
-DESCRIPTION="A library that performs application layer protocol identification for flows"
-HOMEPAGE="https://research.wand.net.nz/software/libprotoident.php"
-SRC_URI="https://research.wand.net.nz/software/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs tools"
-
-DEPEND="
-	>=net-libs/libtrace-4.0.1
-	>=net-libs/libflowmanager-3.0.0
-"
-RDEPEND="
-	${DEPEND}
-"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/-Werror/d' \
-		lib/Makefile{.am,.in} || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with tools)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-libs/libprotoident/libprotoident-2.0.13.ebuild b/net-libs/libprotoident/libprotoident-2.0.13.ebuild
deleted file mode 100644
index 8d80ce7cabdc..000000000000
--- a/net-libs/libprotoident/libprotoident-2.0.13.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A library that performs application layer protocol identification for flows"
-HOMEPAGE="https://research.wand.net.nz/software/libprotoident.php"
-SRC_URI="https://research.wand.net.nz/software/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs tools"
-
-DEPEND="
-	>=net-libs/libtrace-4.0.1
-	>=net-libs/libflowmanager-3.0.0
-"
-RDEPEND="
-	${DEPEND}
-"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/-Werror/d' \
-		lib/Makefile{.am,.in} || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with tools)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 490459b82f05..f8272b1202d9 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -13,5 +13,5 @@ DIST libsrtp-2.2.0.tar.gz 308469 BLAKE2B 4ef318bdf5c69b69b5869f478d5f0b9ee82d7d8
 DIST libsrtp-2.3.0.tar.gz 633819 BLAKE2B 9ea40e9689fabc29b7a2c637bd4e4a2c44eec79205a6e5c5e5abf1069dfec7ba28d868ba620462205d61fdb28d0ca3b8532c1f59db704edd508e01afb551d255 SHA512 34b1a01cb9a75aed175be09aadd2827224203b9801becc3fbc5214667cce79c3b87b0f59e4315583863ab5a2cc4fc81d56ab604a5e4c984518b8a8a2a7b77461
 EBUILD libsrtp-1.6.0-r1.ebuild 2389 BLAKE2B d51d6d4d616597b53740aca43f4d91b796de4c65ca44a4b56821b5b53d826fe4eb1c4b583124f1cbdd7b6563dff4cd38ab44bb2f62ca1899817c837aa4de3568 SHA512 91c84e2323ad56c00df5ed6ad65038103aaf28e48a8e6becd9be0e7b588f6bee8d4469c2339d77695a9ffc02675c03d81aea0bf2db00e1c14cbebc2da7d4935d
 EBUILD libsrtp-2.2.0.ebuild 1889 BLAKE2B e5b613f586a049a0f5ca1e16de374ed9fdb128ff7daeed843f00372b71bed1c04e56b62a9a986bddc514035eba9f2bda9138be0b3e5b0723fd6e8906b3fff369 SHA512 76ebeaa5821be19493463e4394c6dfdef875bd402015aabc2c3cab3d30456a95073022f6bf115a4b7dc0fb8730d3822b7b487069cbd26316f22b1649ebeb24ba
-EBUILD libsrtp-2.3.0-r1.ebuild 1996 BLAKE2B 9b8c9b7186266cf5f73140b6e3ae260a1235841061150faa3fc448ccfbff0e628f698b3b9c9b1ce1ca95931c6eb011403c5e9c8aa28e0d6a5990a7b7c8fdbda0 SHA512 bb27f2adb2216cee9a9a23e7d963332de7eb234b59339b00261e37a2208f9bfc5dc6ea0fb2b5ba2e5419fbe8a8a7d20870739d159024db506a8ea764930e1692
+EBUILD libsrtp-2.3.0-r1.ebuild 1995 BLAKE2B b61347ddaaae925927d230aa9ed5f26177479b06701425750001dad397956f7e853b64e280f5ab58508d164b8b3c717a46e59782545688f01501edb953081252 SHA512 959f93827f99cb662363a1d86a09d661d616aeff4bc75fd62d8ede24d2a254eb5bf497a8d773d6829fec763df858c5b7d63ba28606b8532675cbafe0c3c72b55
 MISC metadata.xml 837 BLAKE2B f256f76392707dd326a4640809e9333d5ac89d2d7da768b3d630d6c78ed3f873ff8d9060463c07561d9da810088b7f6cc766038192ec995486de08c421e1dded SHA512 ba6fd1852b9b226f2a418670df78c75e0a8bb509b23a0a4cc9b806daa82f4f6f0af4624a13f2788931ec758635549df31a0b2c2d6588388695523a7d511fd055
diff --git a/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild b/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
index f1fb9aa41687..4022b61e2dfb 100644
--- a/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
+++ b/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos"
 IUSE="debug doc libressl nss openssl static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/net6/Manifest b/net-libs/net6/Manifest
index 155b519df39a..ee90c206314a 100644
--- a/net-libs/net6/Manifest
+++ b/net-libs/net6/Manifest
@@ -1,4 +1,4 @@
 AUX net6-1.3.14-gnutls-3.4.patch 943 BLAKE2B 47b21caeb130001c44a44d84bc9a6fc459f3e5fbd5c6e19762e41dfe0b8ce04cde049d0f596f4c05d767f0ff0fa76ce56c4881753542bae4ec215cb4b4769a62 SHA512 8fe45b816d21d5542aedcd88cde8013815a9035c51174c6f6f5ecd90eb75380a68c4d376d2c5f45280fab38f662bc0f7a97815e8bdcb335030cd0534c30c542f
 DIST net6-1.3.14.tar.gz 483549 BLAKE2B 171251fbd24eb76cf06999d64ad818817e92abb190b9df71a75c7f68e04a5012e555767b49d99cba8dcbb060e70830bbf47d8fd046381ffbd23c036258e56a7c SHA512 6a604d51da32b13d61a45d3927e937c2fc5dc83061ea4312df363a57ba1a9830215e0a1b794914790d4606411cc71211675ceca86609614718aaeb998598c5c0
-EBUILD net6-1.3.14-r2.ebuild 776 BLAKE2B b590530ef451ef20db1db2490c12222fabd717ea126868cd40cdbc70f12a0a6d8339c6c54f8ca86db66d94a6d7f3f262eae27299728d231dd5c179b177137279 SHA512 73e4f9a140487e5f9d5471a59206251e4809c697cd3ee91e051e912787c13c6d46c9e00af0ee793468903cdfe7389e58894648762a4eebe95eab270973be71b5
+EBUILD net6-1.3.14-r2.ebuild 768 BLAKE2B 7123a310d87b430b01f935c44ceab6885a97a5b329af009d737bfec690bced5333677e1d06c98283a0d624e6e628b0b615b8001a0d132a98b113baaa65a0a69e SHA512 254b3c646c907fa43c7bee97a231ed33cbdb81d6a97cd0d50e54a6ac3a951e09589e178b2cdbbf4f17387e977bad6a3632a6e5b21e870b64bbcbc23fabb8aaa8
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/net-libs/net6/net6-1.3.14-r2.ebuild b/net-libs/net6/net6-1.3.14-r2.ebuild
index 7d269bc823c0..cb41c438fc5d 100644
--- a/net-libs/net6/net6-1.3.14-r2.ebuild
+++ b/net-libs/net6/net6-1.3.14-r2.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=6
+EAPI=7
 
-inherit eutils flag-o-matic ltprune multilib
+inherit flag-o-matic
 
 DESCRIPTION="Network access framework for IPv4/IPv6 written in C++"
 HOMEPAGE="http://gobby.0x539.de/"
@@ -12,13 +12,17 @@ SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~hppa ppc x86"
-IUSE="nls static-libs"
+IUSE="nls"
 
-RDEPEND="dev-libs/libsigc++:2
-	>=net-libs/gnutls-1.2.10"
-DEPEND="${RDEPEND}
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	dev-libs/libsigc++:2
+	>=net-libs/gnutls-1.2.10:=
+"
+DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 PATCHES=(
@@ -27,11 +31,14 @@ PATCHES=(
 
 src_configure() {
 	append-cxxflags -std=c++11
-	econf $(use_enable nls) \
-		$(use_enable static-libs static)
+
+	econf \
+		--disable-static \
+		$(use_enable nls)
 }
 
 src_install() {
 	default
-	prune_libtool_files
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index 54a18fd7c21d..6332dffb1b18 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -3,18 +3,24 @@ DIST anyhow-1.0.26.crate 26024 BLAKE2B 09cdaf61531f3a36b186fbebc2c783d472b54494c
 DIST arrayvec-0.4.11.crate 26439 BLAKE2B 5ea27434d57f37f7ea3e7d94acc1a3450ec464bd62e2d377cd378f4faa13078244afc53284bf2838ea0f62802801961d6915f202eea951a8792e9fe825424be9 SHA512 6919f07fce0aa834b75ecc722476d05580a7dd58e8119b0ead5077d6501ee69ffef71016b6e63ed0617ce2d29a6fa1a4f5431d7aa20340c9f3f2e4c9c93d49c4
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
+DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST backtrace-0.3.37.crate 67955 BLAKE2B af9deeda806a9c47084df102ed6f5e6d57a81db9ac410678684c7026069be43bc4efd15bbf4b042d5aea9d85d619168484396d1dfc2ed83a69eeb29d750b6158 SHA512 d32ef8fa11cffeee298f7468f8f9b6d3492cdd805679fa72600115df7dd7e0ae65378ed7aa767a75a90743e278018cfb9631842e7eb633869d77485405dc520b
 DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e22ee124d8a864c2587a78ebd8d619745dece654357cb9cd970ee20d7c41d53c84ecb3ed92beefaacbcfddfaca804ce5 SHA512 6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST boring-sys-1.0.2.crate 3121250 BLAKE2B f38c29c9c28a000ffea914e94b7a6284f20d50395a0819f1c7a17230399bc0858054d4ecbc3568e533961faadfecef60cdd13413314d15395165a2ab9e2d24e5 SHA512 b64066d8edd93be7eacb4d3811f960470389cef339c9488a8ace46ce15feed9e147662316bf497a231a07bc86402693897a33432a7b922a3e073f208dd4dbc80
 DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89
 DIST bumpalo-3.4.0.crate 129102 BLAKE2B b585c8d682acf555cbe695dfe150074e4afb1620736f28b29567070e445a12293b460d3c85ff88979abfc74fe7453010ebbcfd64bb2b2d575258d51fab2b1400 SHA512 955e49eeeb803547092b58c086a2582e905578179d93500c1f55dd3fb7a65349f33ddc4c2710c0ee804abbe4e1f2afbdeb998533d362177298a86a4f9a8822a5
+DIST bumpalo-3.6.0.crate 133234 BLAKE2B e59b65a7b3ff3a7a6d2a91c80d16b169dd974a0293e65ef34b5249530e2a6e038bcf56e1c0886e4cd303179a7bcf6302d109136b226cc5776b6451a3eea32b94 SHA512 d7a6d69e1641cc1a120ca64a72e241864288112f5b051973f404bc409be0d77254cd8b31116a508bd8b025b4617cd2ed9ea67f25c3fb9dc5863bbecf436d9761
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
 DIST cast-0.2.3.crate 11446 BLAKE2B 70003625a66e1f505d81cb324992f38388762686def5f6edd8023d55425273b9aad36a2d1c7f429799565c02a0c9d6db1a869137aec9c8d1e2fe12b228e4c8c4 SHA512 2afdba50989aaefd64b2cd1274dcf8812f69e7b2d8ed783a261fe9d3805bd7800e8e0b30beccc64f640df1a869c012d35c7cdac5ef976829a53dc82e73048ae0
 DIST cc-1.0.58.crate 52896 BLAKE2B 118619bbe306aef5cb83350ea04a7660a4af2c365a5f0c30d045cdca73f7d68d6646889295590dff29cbf003b44f9b00d5eab22fcde8a57483aec615278dfbb8 SHA512 0a208c4dd7700ba92337ad0044c0ae1614b105d6e799fc660d07e7745c60d8e4c8d3688af7ced77734a2a695ac2e7c565c2f2b7a886d71714c2f7675ea2a22f7
 DIST cc-1.0.61.crate 53454 BLAKE2B 250a847faed1e7ae0a7d3d0f15511222a8cae499aed1e6736d65234d6915cd64abf0b01df5bcc38ff2800902854ed57b297fea2c63d41a480b02cb07863a7490 SHA512 c238590712c5359040ff9670fb60690d983b1a2aa53ab7031f552b4eb026c9e305f401ade77ee389eff90dbadfed6eb1978f67bfa143589a0e0ccf39edafb5d6
+DIST cc-1.0.66.crate 53454 BLAKE2B fe34309ae50a3b022c36270a1dc819713f9d70e9ade2f421c33c542e865dc861e3b5191e8949de253515aef6878f786a6abe048391a819d09bf57f33054a90ce SHA512 b07a70f88fa0588fb0f6bc7376e985834672cc9914a0713afe01740af6bcf01821d15720d831e8b7ea8b42f5866dbd011a245997f35bf8febc3b13d66089723e
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST cmake-0.1.44.crate 14377 BLAKE2B 5922b7dd8618e7982064fd754b1ee54941a4555961bbc832da6fb149afa1317951e4ab710f2a13856aee6af18bfd9612514dc56e795a013c8d4094c8be1fca11 SHA512 7adeb6289fb1072aa739b4f6bbe91f612fbab730c3ea67b6024a31ebfe3fadb2da798495ddabd5cbaaa1106bc4ae185b350f618eca3a72de4ea0a4d526664657
+DIST cmake-0.1.45.crate 14375 BLAKE2B aaeb4b910087bcc735f2cef65fb46184de3c3181add90715ec709c3162c081cc506ed4c7f4f3e6ed6d76aef8213ce80b9b865b2e737166b498a50b60acb7c83b SHA512 7de4ae0c3a50806f2b060e145948be6c6dd0db3975b626e0432301f454612fb7bc7fd2f4549529deaf7a1a55063a11dd553efb59a9dd5aa61ede5e63371d6b2d
 DIST criterion-0.3.1.crate 95450 BLAKE2B d63477b414176eb3b49857b6a6e3f1e30d72e95856756051974bb99289082315bde362dd39254a766480e167707a147b621ae84a887243ece6f865ba784a9210 SHA512 c6beae7350029632206cd201faf3e9aa16fae39e96b9256b702cb4c09b013be88280b2e8b87ec2790c386be8ef6f9e9179482655f3af3ec9e34f8b402fe8bec9
 DIST criterion-plot-0.4.1.crate 17185 BLAKE2B 106f956a32ab2a0f274882e2cf5707c9763e16ca9e98d2bda2ac92520a9dbff46ff4748f4b14417ccbc288b48fc527ffb9810c3cbcd50c1744975ed2e998c148 SHA512 910ee12c373b2003be314a495d162eeec2b6c5d54fa80f3cd31f5b5ef4a5c1c32181ff0744dccd522ca2e5e501a88cf4c56b231f8eb9b2f2732707eb82f98c39
 DIST crossbeam-deque-0.7.3.crate 19888 BLAKE2B f83e6915624ed8d01e56ad28e0a40e84732d820fd07f0f0fa4aac9578aed0f4a980bdcd64d29811be2b5055f28135403faf091b902dd4c800d6d736452ab03d0 SHA512 7c6a42643b2eda7ffbe2d485de4d3723c6a37beaf77e81329e39c9300a80492ef46650fe5a6b18101d3f6b4ed031ddb06174624f5449998ec3a7808e979df131
@@ -30,47 +36,61 @@ DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
+DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 DIST hermit-abi-0.1.8.crate 7581 BLAKE2B 90fef564dd39973c5ff8ee3d4a9b129f1ca00800ca459c644ee08df1542c5adbc06881a7a59d37fe6e03a72a2df21917e38544759a2833dd8f8c065261cc1512 SHA512 25f7806834ea007174001284200201895f4536d5a447dea6c165b43c30b30871f78da5f3ef0d79579e3195951e6fd7ee5e21ec80811c515fd096f2e7b3bf7b9b
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
+DIST indexmap-1.6.1.crate 49644 BLAKE2B 605929e1b6b3473171fb2af7500d769783d7e3872244800c107664fdd7decb7603bd3657ba208d3022a931fc499bb2c2e6b8aed85f880d3ed1deb827dab70703 SHA512 a859cf4f2db46fe753aae0562ba6ea32dd529789a29784324e82b03f64f42a4f302789230ac298860513b1cd8cb238b7a150f6f865d342d606fcb7a2787f9a03
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
 DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
 DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
+DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST js-sys-0.3.42.crate 67017 BLAKE2B a5db2a97a9cc4738d698e3db36c0a1024fc3d60a23dbd0ec4ddd7f887d04a7860b1641729ea4ac24669d98aafaff78d0a3d8a3211f8523e104cd668a11ce2af0 SHA512 5193b77f58741a7cb59ab871d5e66a2629e56c8a036bbe0cd7619e1115e9925e19a5f01f6b0f4854c22f36fcc3c1a335779f5f6923dbd6c617e850247a3c85b5
 DIST js-sys-0.3.45.crate 67143 BLAKE2B ecae52ec5f1cc7a52baf3d82915de57f9351ddf5e9fa35d279336ee2d2d5547e640ab8387d8d85ce9ed2ef02ad63d985d26db0df81b482bd021f8a2bb260dc28 SHA512 34d27c11bbdbfd7745166045ee20c578d3b4b917b5017a24d55349b5064d4f4bfba68dfaf1f16ce7df06ca88f727afd61487e96cab0e480447fdbf920a0ff7e7
+DIST js-sys-0.3.47.crate 67063 BLAKE2B c4c6f0bbc18e6ca8fb01ec052e1f897c69a4fa1276afdfc84d9b0f030ebc267022d5e397ea5e95cbab3e4e62c4b12b51756bc7fd93439ed0c9be506f5090e077 SHA512 28d4d16059421862db91789d9401486708a1e1c32f45717bf18507bc38ae8b52c40f9f7a26fafeb11c335ccf49b552d95225462f6246982a02eb3f2123c8a6b8
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.72.crate 478292 BLAKE2B 23914e92f9ae57a023bbb9bd9cd823cf535ba14ce8d01f171d3223cd227bb9d3884f7596dc2f74c690f7de813da4783e277204dfa690fc1e4f26ee566f1fe32b SHA512 f59caec272f24b8cc29d421baa4ee4145afea8eb9e4a83d8c245602f6bd8de3c91c04008a9920f7f70c9967a3392cc44d8df141c83c6c18d1f14893b21ae4ea0
 DIST libc-0.2.80.crate 513503 BLAKE2B d4bb5f789efa230ec9a7a2071652fc1e344669e5dfe3a2015694a1e8442cd5adc142f1374841a4f01984f132f0ad5f027913b201cd624f97e93d2bba31ad96a0 SHA512 69b2f4c67d29bd4fc8f6d0388036ac3ea0de2ba7387f56f4e4bd035696ba313fdce10d18107ef83490f574d6fff796b305d5f2c2bb03a7cf33b9136386e65b8c
+DIST libc-0.2.84.crate 517732 BLAKE2B dbffb14589552ecb7a6f610afd01feb94d3f5fbd44b5f03eb3f8ffd855d1e8eab4a397e3d40faa854c7ab364a65d11fc05118ecd401b5fe6a6972a82980259b0 SHA512 acbd268e02f360907c6939805973cb45f1f474f71a09efcad9c6a603de9c814a4912764c30ff8c929e06a544bf3e03eac08f42acde33a3edb4dac479f257eaa7
 DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
 DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
+DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST memoffset-0.5.3.crate 6107 BLAKE2B edafda6ce36dc8bad6bb1f2d824d6c6726b24effaaf8b6e1e612bb95c506d9f0aede29fbc7c5cd71b27b624ec4f4295b0f09842e6b66257093df8db076b7b974 SHA512 a647140f4218bae56c48119a21c96edefb214a10329bdb91f16382e2b85854dffae33c6c3d55bbad3dd7c82424f0a10e5d97a9010ccfe84b7339bc5f16c4786c
 DIST mio-0.6.22.crate 102782 BLAKE2B 8a088fb24797f4b16b6da28fee56a1c8bf1346959905c3501e3d78d16d169125c03495d9e21dc9da4fb6735a48af38b2883544d1c9ea2486d48542fde6ad47eb SHA512 b500b0271779942512c1d02756ee4caf4e00488f6929a06a7be8a46cc44318edaeb80abfaf6367d7201978a3529a6b5424679e07b719ee8194f0dc37aaf56ca5
+DIST mio-0.6.23.crate 103554 BLAKE2B 1286ea6deb7579964a5c15926509d438c5454d4f56e936753c76927826fbc5444dbe33b7465a15d0ae6c122bcc98899959391a5418bff31c176d51d7b2f33077 SHA512 ea95d15072fe36524a85b50108415a809d7ea3744deee45e4b6a1b763a11c88cda6dbabe4f8d01945a5edeb52296a74fcf457c85be3032c1311a35025860d05c
 DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72
+DIST miow-0.2.2.crate 22044 BLAKE2B bec3bbd899a080e5c97a8c1dd9dead16a57aa44cf2bcd97be03155c28345c45fb731650eabffd2fe18a633ff947e63561327cfc86560ee86c3fa71ad4d2a3b62 SHA512 e42012f67e1c5a475d1c9790bc731add53f7a3838d36f8a701f69974c3ff33d31364006220e69c8f37bae2eb31055ee704c42b64241d13be528c768ca5c3d6ba
 DIST net2-0.2.34.crate 20620 BLAKE2B aee9aac0deb14a13c5f90793f1e439c94362403cb329e24607c1970c117bc379049da1b173d1bf827f0e3db38740a2d2e696981daf88c1b2302d81564be5433a SHA512 136ba95ad540545165fc2e34fdb5aab7da8f6b20e7682302ad5796b86cbf3d80b5364679c82caa19151b277f9d18de053968fda779ffff8ac88024940772709b
 DIST net2-0.2.35.crate 20660 BLAKE2B 8bfbbad0c8ccd364f1be6fd67b3087a0dbd7a6301b8133bd28cacca3d32a5baa9dcbbc81cf957bf1591b20512f283e3fd441190e33c3ddc09dea3f9bd5dba251 SHA512 5a5b4ee65654fec31d820a71bc50a0d81555ab661e4d3c1dcafb048588218d6ba347f1ce5423b092f078f3bce55f7c74e33193d1924086bb1d43a5e6efc80540
+DIST net2-0.2.37.crate 21311 BLAKE2B 21cef5df92d5d51c8e23c57ad2225e3311c13083fb86830bcb313965eb5ad0170519bed9a47cefb2305d3614ce55e11896a06437cf9ca50c79b7843ea633e99f SHA512 9ae70c655468c3e35ce05988626e0398a3cdf7b7343c08aaecf1267bb958329e608b814cc7be252fe085de3cf6913a1c72aad206c677459469ba4886c20206ec
 DIST num-traits-0.2.11.crate 42000 BLAKE2B 78584a3e8011391b47c7ce45c5a63da5fee88aebc2ee7ae8d788e22b1d6cf46e31e70b7bf6ae094d35ed8dd5ea4f91472e6050c526acff3f181ee383fee139a1 SHA512 12d73656db34456a30de7538daa1efb6e6f61353a0e274aca388bf184732402d8eb8ca19282fbf51975e0541b5c8d764a0148abe346061dc81922d5eb12592e9
 DIST num_cpus-1.12.0.crate 11867 BLAKE2B 49ba476ebd14f2894dcd3e017921a865ceafe62ebf990a27874d264588f5e45fc8d6c3a3e82717e661434daca8b134faafeaf55f44e6ac447b81f162a9cbc695 SHA512 502cb7c7abdaaa42e849847313e6e12b34d9d619b58dccf7f3e80458b5b7778657f352828481daa21d482c247cfbf6d167f9ada8bbf0c3186b82d30a93a6e381
 DIST once_cell-1.4.0.crate 24625 BLAKE2B 6cfb6ffa2326fb53c4381d4b6a462928f96ad4133c653335c34265a1475c4f50067fcd2a6d9bb0660aab4406401edf02776ceff8d2b43c9d6b443998d2e3cdb7 SHA512 8debf21169653719820c4892ebceda67fedcc3c86e958aec42ade0d38247e12265a0152846f9284c37faa183e452ddf666b117e7ec5c066893cd33ec407dfaa6
 DIST once_cell-1.4.1.crate 24366 BLAKE2B ad569e1d79ec41800a62a84be50d1624efc19e2d08757964e84eaf8b1bc341988636723de8f0c87b37cf72dd4a4fed9a4623c6deb2577172c3d85fd6849685ea SHA512 7d075cb115e6146a9e08e27fe123865bb54fb73c1da6c84f3ac991ff9f6f83bbb55245a9741279a12b72f143e3ed4ada3da7b13764e7655dfe64b70c5d6c1958
+DIST once_cell-1.5.2.crate 27660 BLAKE2B a5413b7826abee1f700c55d05cbd942c6348b3d387217bec8f0de5188c3c8d14c76c216353e22e1dc7e2dfe1efa848a188af31254e3656e5484eb0cab2802f61 SHA512 63e7977e10a8b1eeab4c758bc03dfe7c78cfdd38f12667fc1d4842c657b8a4a2c0e46c21d7201a0fd5ed613055bedb8351e13bd2a4fe906d7fee0d51d67097ba
 DIST oorandom-11.1.0.crate 9762 BLAKE2B 0589af12d0ad99009655272035738a6a5f57abb47eda2f2dc3be443474cb67cf4808207f95aee0be5417714f1c72c13fca82fdde778565574d670271ee9528d1 SHA512 faf840b52a315125d5f6c80f6101fcbff6ac29217d362915ebbae4f7337c18ecd46b89da96bf67147e84d0f805edb626be0da448af12b0bf537fb0f0a3a25c0c
 DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
 DIST plotters-0.2.12.crate 3194754 BLAKE2B 21035d561321bc66b47cd3a1d3374f4e11d49cae62cc363a3bac98938328aebd527592270ac4014f558751bcdcf7e4994da5647baf98437200a93849bc9e549f SHA512 f9d8be381ffbb853b9a3bfdb0cf5b29c23fbab9b376ab2cc9a734fb7d573a1ef1ae3a32c5b4f080f534e52505fba1d6051475d62811da01205323420f2045dff
 DIST proc-macro2-1.0.18.crate 36252 BLAKE2B f55674ba8294f48d72a71dbf36a2e464898b96e53ff32d8dfb6f66271a3427e59e5f8e868309aa6c15e3b718983806b35f65599afa119ab76b658af863f90e63 SHA512 3e7cf577bc3548e03a2f1bee620e3ef484dcaa45fbaf7858a8ea04f79d82d636b527584765ef43c92624e1a1afac50e60ad3f9dd8efc34e8e6b84cda20c864ef
 DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
 DIST qlog-0.3.0.crate 23295 BLAKE2B 1a4216fee65e73f72a85a4227a1765883fd121fe4d0216d28755501b104aeb80dbe5bbe493991c0a2dd635351224f345b283e18e6db2206556b7cf0f3a884c7f SHA512 76a234231b2f4ab7af9ede41525679595083b5faafb3e0e516e08968ee9294f4a0cc74b81df69041b8dcafabdb09494f9cad9a73cbbd1aac3388667d8366dbf7
+DIST qlog-0.4.0.crate 23452 BLAKE2B 219053b98d09189415d45c6487356e565f6240c35508b84dc4b1a1d0d7aff0af8b02889805cc36930c600ec37bdc2941b52d9ca325c719497ee49e5bdbf3228f SHA512 d1ae8fc0ec99ca77946e89c3295183aec551e41f44e5c44178c0b60e997311a6fbce7a44eeafea757303f6f051c3fef08724c85b273dd11014d555f3c5761613
 DIST quiche-0.5.1.crate 3265682 BLAKE2B 1d404317e48a62ac2cb3759aae51f0b91eb87d9c9694333331db528b79cc19a72f0f8da2b0785469ae81237c8b8afa760a4f00b039895330aa8b6e3b3d356ca3 SHA512 7f9af3f104aa788076cf7be2f643c823264cb616dbc9dbafb21afbbdfde4d74edff9e48ef79828ee47e3185215a3177131dec9b48a65e96e8ab4b6214b409fc5
 DIST quiche-0.6.0.crate 3264703 BLAKE2B f5703d86866b4ff11fba3c620e65da26050d744202bb520783c91f9925e030f0bf5ff2c75af02a015006d9b8a3991092df15a523dd316d7973df06c694927529 SHA512 c73a06d8f426193c6a0859a4a1beb453382c6dd67e70e1ea58999a5585d468442ea86457f3dbaed1d6d5dd33fc204a5c9aeed26de1072563d6951c4f386c957c
+DIST quiche-0.7.0.crate 3405961 BLAKE2B e873c97fb6cec335297753f53dc8db74fca8716fb9ef25f5d5d5fbed6e34943205e15eceb4988c3e061e557dfe20efa38c70850938b23d9f5520f89296581e7f SHA512 35d6bb736900c6715dab5a1706729591e884fbf8e652a161ce4b140a799e0d752aa14a414902418a8b97e3e77d27759d61c17a53ba6d8d289238d37bbfd8fb37
 DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
+DIST quote-1.0.8.crate 24997 BLAKE2B 53f8d9e363e2697b580f4bfa39257a6ea1d1899f6cd73f96233cb476de1aecd0c4bca9a8856d128af81ae0f428be71c19b0d2e4816d856bff20030c4cc9258b5 SHA512 448d06465d93d384bf31b0249fd143a92edc4b9be8bb3a8c1a86366241be6469c3874dac98acb3810d5177b106d7307c7d9e879f91cce2e278a319ef1935577f
 DIST rayon-1.3.0.crate 143294 BLAKE2B c52c0ca7f3424eb6c251f91a4a8f556ff40120889b91fb0e4dce36401cbc653310c16393c12b73b29d56eb04846e06c04942b7fd41173cd8fcd8dc11046163f7 SHA512 176af1a8148026954e271ece820c67b215223cdf11b80ff4e3229e4871ad87ce9c21c0b5b5c9f1c9e8063102ed0722c3e5194c13bbe77d8688fdf81e0ba8a599
 DIST rayon-core-1.7.0.crate 58306 BLAKE2B ffcff7e465267a5c360fd92089787281fd1dc07af05cc49b62dd2030267fccb31ea7590509d2af8b7e7a87df9f23167358e91044bb61062bdfaef790d2a4684d SHA512 7bacda8330518c137b433ac1f7f65f64aaf7939d7fdae1c8263bdaefbdf6734003054a1fc7acf73d4e323f27e9f152f273ffb7388abbf6cca0fa2357f1362e2e
 DIST regex-1.3.5.crate 235308 BLAKE2B 66548c392ff921815d3be3cc196c6b1ca1ddb3f1dc178935f8159335ea9b85ab7264bfca468a3c63c242c522095fc6faeb7da19b0968a40b30ad55b6536f8201 SHA512 c37c28141a9ed35250f830d1d4b84dc527cb880d6093f1e95b348aab7ecd2d2e949fe7cc23bafde217a4f704eb828bef1651854ef4ab9593e7b4ac006d2a5ef7
 DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
 DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
 DIST ring-0.16.15.crate 5279241 BLAKE2B 1de5d0f5117246e344a04b6958a678d067a93083dfba74b057a48dfe6922bc8b980ecadc94fbf76ef996dfd7ff3cc7b2da6a4c7c9ae31fb6dc334a3b7a377533 SHA512 17c72ba204cdbc80856bc588dea220d2475a2dd1e2990ec9bf76fe4c0acae8a91a8fd532127e2ce679b43be0a52bc05dcda309744876d8faf0c50de0bb8c399a
+DIST ring-0.16.19.crate 5195787 BLAKE2B 308feafd2a3a673ea47b4e62b94352a070cdd8f91369bde9d1612b6627a6ab387d33e6a8a612e66bda396935d90b3d8e0c718eefc627060f40c879792eaed907 SHA512 86dff6211232c6175c395d8716dc767929841efc34af5f2892d1661e794dffd20bd7df3cb1f68f1fef57ae4636398f9d0be8ad0c2925067545e6bad2d3f023bb
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
@@ -79,26 +99,35 @@ DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.114.crate 74453 BLAKE2B d5cd4b23a0b6555f8efce963e833b0c293b53cf33a3846ddb189c8d8d8ef5f157c45e33833baa21683a336b60de4785509288c417243b43fc5395e5df6a4e7dc SHA512 9c8db28e52686bc0d428374f13e5a5f4ccb235ef17d8840aa676042321fc89adce4cef4dd00700bd25c2024f79a96d91eca8ec9122e899056116a890cb90300f
 DIST serde-1.0.117.crate 74505 BLAKE2B 59c5243dc10c00762659ef6352dbec857966540810117990f49eb1d19de435284151f8f0211000c264e7f7c6d3d4ada45c695384d397b31daae32d95efa13048 SHA512 77001954c9f1f7eb11c7a6293454dc0c581e536f4a07368dfcf62b744f42b620a6de8c67ca89138291b964d17f198274e2372fb72a9905dbbafe56276c5a9d5b
+DIST serde-1.0.123.crate 74379 BLAKE2B c6d1a0d833b50d1ec65f7c2439388eac08db6231e5f8d719582d545948b5f36f2a429338e12e33e4bdbaf439cdf25840e37f37470d993f6e80d8e5746e5c7564 SHA512 73d584193f1885561063d15c0124f0611f59ba60b14eb5df3fdfe9545e9e31a1a2afdb22b2a7dd4176ea0856a24352ca6d822e0bc779f0fbcfc41e545e27e823
 DIST serde_derive-1.0.114.crate 50733 BLAKE2B f66ccfcbd8ccbdea4e3acc7fcb33fb1da516cf41e75c2993c2de79cd139fdf1b7c0ff6a95790df623eaf8b30fce4dec80f2a9c5332a8047dd0812fa65170737c SHA512 b3bea48a9ddd9c442a4ae6d0b76a116450e648976c02f07c2acf48459b15aef9c69d4843c2f04f387015c7f3ff5c3a1f4e5d1dc1e3a3ec3a114f6a651874aeb2
 DIST serde_derive-1.0.117.crate 50712 BLAKE2B 59bf7592d80ab2085899e256e325e0e43c69ba2134ff423e0612f31cdc1629e9d519be538538546f21067ccc460d07619a3fb2312bb31263a63ec4f624fad788 SHA512 072c761421d10c1b25d545991c0ba9ef6dfaa1a6fa8797abd4a2a194b121588d25942ce662df9b4c5de2fea229d6c06c7963224ed80e3fa11fac07f6dee3f72d
+DIST serde_derive-1.0.123.crate 54122 BLAKE2B 9663f89cc23966d338ed1f952629276b4dd6a4c7edb8a3d9cc888e135752a7d5b748d55428566ce5ef98c11593dd45116f7aae0278bebd41b5e818928a414579 SHA512 ec80de18fcee0c50a4297272fddb54e111b580012ec79b7827ad8a4b9c02a621b07aa02070480cf89d6eafc1ed7a577d763c2657938f14c5b546d98e0df83227
 DIST serde_json-1.0.56.crate 114541 BLAKE2B 1e393b296983b55d6f516f87ac0b3222956e3ecd7e088955f430c0957642ba59f6d7e927bd924b30f8ca989a04f611078b5c05690d8b1195a0e8b0d11f1b6412 SHA512 ee937a1449701235984a71c9e92035251019d922eccf29e1dc95cdfa008e9bae614650949d8536a5a42ae7b8decfb419b75ec5285b1f85618750efbad24cb11f
 DIST serde_json-1.0.59.crate 114956 BLAKE2B 27552d21b80d88cc3c643b25e5f0105c0d79a7c74c5bc3c2cdcc68050103ad73b75f7ee9d1d5afb60adbae33c351091b180cb1f8aa17c80f06cce4fb4c57f2d8 SHA512 2f9bf96fa770f9be9c43fc889e1671e9bb883f49a820aa69a1709d9f679f21f01cef2b771eea4d1fe7994cf850af44577710521fffdc4cc46d0dc6f913842075
+DIST serde_json-1.0.61.crate 114887 BLAKE2B a06e2b3572b01b57d39a7df4d4c333408594cfe80b6b6a810f8c36479550f56f085cbd7e693d3c27f307bf0b49eefd34f55bef1872a4a0318797e4b9585cce9e SHA512 ff626602b547fa8e48c37251d2f6c91633fd45b49ed8211e66a3174f52f9aafe8778238466e7deb5d5477ed23eea0091596d78894e0967d6978f6737ae115891
 DIST serde_with-1.4.0.crate 25789 BLAKE2B d91f5fed9ef2f3a8b7a8973e69ffff0715bb0bc0e2c9e92b263139ff54f2c325926db9312d402ef6b47006ccce6d951835896893b1d27738f22f066e61e64260 SHA512 702034da0c16c57b8f66301619f9323bfdfcb4943b4a6c4df89508345b6ace57b1caa6b3b2d662eff9c9df6ddb313d2fb2ef85d7f8a79bdb986eb832cc716b89
 DIST serde_with-1.5.1.crate 49687 BLAKE2B 6acae2c78b47fd5d4d17f2111f0a14ed2d76be93c1113adfb151b3dcbfa1ec48deb163bbc020ebb230c8263bd3f7e351c1b86fad84a33788b816b59fd9d92ef0 SHA512 4b961006c59c0c8cdb70d6ce7bb99f5ffd49e6ab782e8d20125b7495f5e4425c950ed60727affb8d7aedcad6b735af6505bb1b47414f82e1c731dc79fe1a3c6a
+DIST serde_with-1.6.2.crate 55947 BLAKE2B 44f426a460b8aa4b68b518caf571465c546a888a9429248ea8bec988c84416c5a4a2eac0c6fd37e9e2e3eb48cddab045eb360251c528850203c0971d9e7fc859 SHA512 eca7061d6261d1afc98ffb0cde78c81cf27eaf5b03e662bb783312abdc79d0b844988d0cbe3d2bd723fe354a4ee605cac3595371a45b94a71953f8e0438eba66
 DIST serde_with_macros-1.1.0.crate 11235 BLAKE2B 46d45ef95ca4bf276abe5571671614927aef01c811b5eefd84801b50bf10d7ba562c42caf9ba901413962e4f7b4662e86ad3ab81e0fb4b442e3baa1a8a7f9c0c SHA512 36de2149a1a4da3162458d79518aa276517456c48cbfbcd564fb84d509b267566b2c2dcd707604b502cd9e152eeabea63234837cb1ad216fe4d9eb27c51cc288
 DIST serde_with_macros-1.2.2.crate 14879 BLAKE2B db14145d27bf1f586a2403ac80c24bf0b231146444c90a6f5cfeebbc93f3bba1cffd286326ae30109fc8a2b2aee13f5ed82ec3c4b046657d61e88815b2df1313 SHA512 aee30f8b8a48bf074f04ca7f0da180d25c523521321189830cdcd036db3f66e3305d53aedb590ca60809e6678f83f1133f7965e636fd166bcb0ad8f9752a44e5
+DIST serde_with_macros-1.3.0.crate 15844 BLAKE2B 98246e2de2401fef1523719d6452a9e4350272ae46fb4283afd9bd7e0ecdb1e14f72f130843a7bc9c78be9c25fc3db8ef364d9a0d2753daa2c2bf107664269b8 SHA512 1717f7f87f2e456b56ac93547f246171fa3b9d193c7de41ed43039ce310ae5dca873e5ebd3dca1b331be81e30b9e8fc5948ed99a430772d1bbd9fef6548ffb93
 DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
 DIST smallvec-1.4.0.crate 24645 BLAKE2B ff5102e2b3a03bf5a8e3e2325f93ffc96dccaf2a4c9ca50ccbe7837215eb356e21d2aa5c02e5130a657c166913e8c42cf9dfe50352b6301231b4bcd37225b6fb SHA512 32a56d7055655ee7d4a6556afd63db7200c269a109ec3bee29fefce8bc75363762c3cf625aa3edd3b06a93046b8c64fea2036403b63ac0e764e08af78c936a63
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
 DIST syn-1.0.34.crate 205051 BLAKE2B 3d609502637038d6c2d96b11a99dc96a232ad9d68e94571838cca727dc41450148047509108d6ec3cbcf15f146286dc54023db8ac394b2443a37f55c269a630c SHA512 4aaae0369c08f9f505acc62e9c603d3f5c531f2da42308665cb3c656fb7828ec8c46dc2ee2ef0cbe6ed20c8d7482f66118e4c949f3bff3eb67ae1c93fbbc90b4
 DIST syn-1.0.48.crate 225747 BLAKE2B f7bfc4c38dec562a6dc7ecb7120c6df5e25ddc8591762bf5018ee0efa506613c9462a79e0e9cbd952cf5fa083abc164608d594bf2a47d226de4b4bdf02da050c SHA512 16b022a418eb9a7e5d651197561c329f749050a1710ff03b1af9a5f580543d00a1724826e0ced044d6ee4ad55dc615fff5a71ad72755e1685c429dc5853d93b3
+DIST syn-1.0.60.crate 231087 BLAKE2B c37be0cac1d9a5bdb7622fcf716cf2d7f3bbc1594f978ed98c84dcefce618c87bc8709ee491c0b9d01feba37d6db641eadf60d814df22cf80adc33279ce1ec94 SHA512 8474c40ce4257e3ee7eacd6f993745237181f2463067a9227bb62851d4a542657cd3811fd925c4e06c25909a5f69d9d8865a34fa479cbf3d5efabb1818e64d24
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST tinytemplate-1.0.3.crate 24781 BLAKE2B a965579d9551968f5134e2892595abb01950346fe083a32234fe7184d86b1003ed1a71800a1ddfb2eedd2f3a56baafd05eac5a34a4adcdb1477f5cf510027fe2 SHA512 bb3941d197e3d3f98709d2dfee977a35040eb50217fb017487aebec6d75e53d08cc281ead712bffa2ac606a8bdcb9e5e064993c2bf6e0fe66b1bd3d401ab5817
 DIST tinyvec-0.3.3.crate 17860 BLAKE2B d3665da9e5e2369bbd68c84827ce13cd1c0afa07b8cf689b04a62e24e5bafe41e8f32b136e048ce85aad324c22ca68fb43995a5445092d1f331379366f71cb03 SHA512 41200e022e66624b45e186a5ef6e7cc05dc3e2fd28d332deb689699b17bb85ecd0d960809e4ea2a08ac1ebeb5f2fcf364f4f9626d297f23169476c8be9dc1557
 DIST tinyvec-0.3.4.crate 17586 BLAKE2B 2173653c5433ba8fda3afb7e88e9065e2b5cbae6b25753eb306423e8b0ac694074d678bc50a53b2ccc228a8e8b4d06de2ddeb63f0adf057feaff8a998820eb5b SHA512 91613078d89456fa233ee2fa3309f6b2b8d490771b62fdcc027336bfb20ee5fa3d8d3dec446ab397b5974127567d4f62186c6eea45bd9c767719bb770101ab2c
+DIST tinyvec-1.1.1.crate 39896 BLAKE2B 7655703bb7c3eda6a4bfb78c46cd10d5bd195ccc9aae9b8eab78c1584c904a6ac1a75511952b7f63eb953590b0b3a3c436296c13b6dabba11d279931ca769442 SHA512 de8de26bdb39d4b2255099b85c116a95b7f563f27549816d360a7cf68f04d3940745236aea4c73eeb86ed5427ae5f65d8936f0d60dae9b16076827134d77281e
+DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
 DIST unicode-normalization-0.1.13.crate 91691 BLAKE2B fa4ae7ce7f8e5dd43ab8e60dd48938340485de3537ad14c1dc1e7404a89d2b3022c4304cd85a4c649b8a27fa9c79e4a059d3e5d5c2011d920290d8719c74bc77 SHA512 710e002da7f59e933cbd09fee328193a1e19cce7b12426007ea32fc81ef2adefa5c4f2ad360ad684a937ab18d4be404a0a28c3de375628168fabd21ce1a6ba20
+DIST unicode-normalization-0.1.16.crate 92805 BLAKE2B 556b0b95b6d21f95ad99181e999d2f2a1291951db14e95cdaa4596b159323e999a135380ca0f795c996f97ffaa0c25465bfe5884bebc8903130bfd7437d4b86a SHA512 c1f83a79b0fffd2f0e1b8a579ae4e5021c4cffd74c259d065919b937bdd78b9ef83650cfd777010e7008ceb51e072777b195dd2483e1a85798a98b72f8648ead
 DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
@@ -107,18 +136,25 @@ DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53a
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST wasm-bindgen-0.2.65.crate 156753 BLAKE2B 4b68313c60c6bf1ccdde58c05cf736e1806e1115271172b2751e256eeff83b93e65d00306ff18529f02c7e5c47df89a2784334d8cf44e09ab4d4465cf85dbe3f SHA512 6fdbc50e06c0db49833b2e5a638d1dc2444b326a4ef19f640316fdbbcb83704a79a6fe0f47818bc69d271bd3791ea6945194960a5d005a3e4a823300023a35c2
 DIST wasm-bindgen-0.2.68.crate 159094 BLAKE2B eb7fa3c2f80e5ab7c0d8e99b11bfc025fd32c8347b9baee9f947570a85426dcdadd052248af7a0ab17bdfbe494f71037fa1980fc875d84c089b70a80d0321bce SHA512 a3e877a43242a35518b84852ac71f3cd6c9ca558234fc23bece38780a0abcbf9e7c6d07e20e81c1f6641835ed3b55dff8245fb75901205b0b5658f4e3b0c05ea
+DIST wasm-bindgen-0.2.70.crate 159291 BLAKE2B 8420da36597a61cb293268f7cce742e1ab3f9ea990382af1c40e37f5b088d558ffa28814c8cdd9cad518246451cb9805d708c9fbe91ae8b6ee4fd2c666588944 SHA512 2cc77c540738fe454aebac4d23ad9b97ddcf867afc2fab8d92e1a995ec3db7126b9dc9153a3e47d048477cf15363d5242caee3064ba850780ad5d121368a7c8c
 DIST wasm-bindgen-backend-0.2.65.crate 23551 BLAKE2B 4aa556cd36d2b7742cc8397eab0c1e3c9e0c24433e82a516aa71dbd3a32cfa760bfba93fc4311e9b69f527dffcd39be6dd7fe81f0fcbae30ebe6fc21c5e632e9 SHA512 7043f525453da6060574cab9926023b65e1e402d10c042804ab90ada78981300fcfabb97f3a661acc9c685bbc65a29c7c5c6ac446f11705bc85b8c9488985bb5
 DIST wasm-bindgen-backend-0.2.68.crate 23522 BLAKE2B ad87e1cbfe42d6b3f6c14f793dcec31fb0f9418454e0870a3951bf5f6b0eb9f39e5363129fbbdf986aa50e1fb2c13b03bbd9e21364204ace72460856fcfa7610 SHA512 aae99cefabc91417bda499b4fe8f136a81ffd44d5122f0c13ca5711eae26f2f8b16ef55c18dd4fd3f0e71edfff8610379adc458f978eaab057671b520de9d564
+DIST wasm-bindgen-backend-0.2.70.crate 25517 BLAKE2B 121690827f7500c19d4964b91fd69cc189e018f534e79a8462b69ef8a7c189ab0475e49a9689cbc4ce2ae082ac591567335a5a416675f0afed02aa14d68425be SHA512 22304a91c6d636bd721209c622ffdce4ed2646bb2c0b2433eaac61cb582ba59bee5ec0d08b4ed88695a8956b38292e646b8481cdfdb86de254e1b321a25308cf
 DIST wasm-bindgen-macro-0.2.65.crate 11624 BLAKE2B 010ec37dd315fa9053745978a4bbe2758904f5599c3c05195e0fab0c6bc40e671eb6f025e48afe8a0376933eadf550c1ee5b61fddee0d82f3e8f6216e4615e25 SHA512 a5a1071cd09548b2ec2bd0dce4713f00d72ede2c2be8c8e4b3a852e5b2f0456a1e87996f31604523e3e1f226b14d8e4d6e263af86bdde78df830f65fa1a37244
 DIST wasm-bindgen-macro-0.2.68.crate 11630 BLAKE2B 407ec70043b1b6e7f454ac9d986d6df98ae19c9ab8ada98f4f968520b7cd75886cdeeeb739d61615bcf0d6ca3a757ba618f0ed9abc76308c461f159ac05ec61c SHA512 c70f536072ce9bcb109ea762c6235aea7eafd37eb3faad1b50184b733d09417b02f6f75b5c29fa46691b75b449316a039b79c630387f04903f6304453f98e772
+DIST wasm-bindgen-macro-0.2.70.crate 11596 BLAKE2B ce91e20491ef421dbb4a87d1d775e55ca1cd6367825a7cbebe848bfe6af972bb4f514b62de949b8945da335dc57352b8f5c5fd0c6114498b195627f6455ff223 SHA512 b0deff7972a95472d4edec101c080bdd40e0c2ddbaee07f62093847f7e39142388b6f223cef75d71c2c7c90f1022e9ad3e797439c7d61200719b883707d9d171
 DIST wasm-bindgen-macro-support-0.2.65.crate 17801 BLAKE2B 1c54484f3d04e4da5b5d9c0f30935420f04a3db9389190f1dfb051c283a274a9f3c37685db6e3f40f836f022c92f9613f5b1570b47d53ca1f15418c4b6e02e95 SHA512 7c12ac36a8e7295e66dc3bdddb26ba2ccef73d1d47dddc98d7416f387963a3def8e86e07dd1464703e9f06132ad1353d54f6d220fcebd2d96bb85dcf10d1f84b
 DIST wasm-bindgen-macro-support-0.2.68.crate 17793 BLAKE2B 619c0484ce4f97742972f1f6fed67643f570df3bad436cd2a93c5cd7477a8208082cafdad87e01caa1ba752bb200e65c61e49136e8037a9c52b9f06ca0c4ba9c SHA512 53d3e483a7df0a816eba308e5a9a736b5e812da9778889686994ed964888b4bb9a8b12cea448b1c68607e6a8b10596f8a81f4c85dc1311667cea5f445e7bb993
+DIST wasm-bindgen-macro-support-0.2.70.crate 17904 BLAKE2B 614121a2625eaaaa8303576cc3c3b05961aaa7c4ea0a65244f055582d8c22960d019e4afcaf7332f7ed7fc742a07ad654eb9848587f36270a6c7a64b9e83f4ea SHA512 a88b4650a05d28f1bf42a236b7f506450f3f84a215e363bb1fd434804bd73211ee7117a4fc07a6f4153aeaf8ad03737617aa29bc4072dd4c9f9a0f2c7fbeedab
 DIST wasm-bindgen-shared-0.2.65.crate 6745 BLAKE2B 3881c8e3db5968f51490676cdfa5a06f8def5e8d6417e41ad592f506291299863342fb59984249ab2484ce6135f67df4545f1ab896bc99dc8cd60ef318223e90 SHA512 32aba8419c42b6798ebeeb57cb562251db6d37bff84b4e2f29264b5f910e8e1fc76c8989f82bd8e224dff978d1e7c25ac19e646f93474f7dd53a85ad2a05d284
 DIST wasm-bindgen-shared-0.2.68.crate 6725 BLAKE2B 891ce0bf742bb32be1549c5b8822952f5cdd15ddd73aed164f753fef211c4087269fc3a859950045bf1e895e255b6f09b6788a7a5d43387365079f106580bf90 SHA512 cf161076d07dd7e91790bb1f773a6f53cf31cc0f9ffe7a650c98d2c6c98d02ba8d1b32fc2aa15128f739c86f49baf206444516c3f8b8df82238eabb72032be0f
+DIST wasm-bindgen-shared-0.2.70.crate 6729 BLAKE2B ae9f755efcb7efdc8aae9bbaa4809526ef3b9b03d0caee6bf673e739d268d7de3c40d395e8c78d4b021c18dd457bcfe038e4bb3d15e846d4446f5414819afa17 SHA512 f9ef2275fb3ef0c61d7ed84e72e820f5b607981e57e0ec042cddc631789533da87a36f717ab6ff7a5f1dbf00f809cb32ab593514aa5fcd586ca0e4fdf53c62c3
 DIST wasm-bindgen-webidl-0.2.65.crate 35843 BLAKE2B 444b0c2d46d6971b7bd06f9ed80fb2088818524a58aefe4b0dac7ca4be40bb3480228883feeacadae3be1b3e6c30b7d5642cdae6fd23c11212991eb26a3a9e5e SHA512 3ee204a0e7588f02b19e03c83843f773b179a07815b1c17bb814fb78e5a430ee0d3c8a58b626465709a6f62efadd9467ea9869f5d44c22e3bda2142e96a38267
 DIST wasm-bindgen-webidl-0.2.68.crate 35751 BLAKE2B 0ead30af7cc22475150d9a8c14f75606427e8d9ccaba8d566d76d32f4aa70f5f22812871abf003bb29e81891936e7a2c7f23d323e45480a806aaa6b0ba10ef28 SHA512 e28946290221b0af418f5ba75190e689e99fd67806de329a4dfa9826f389927eb7f93bc74a96f74c1b5d77f9d71373b081b06b7c047d8e0c144667e5dd19e375
+DIST wasm-bindgen-webidl-0.2.70.crate 35872 BLAKE2B e6f9146165cd5097c6b402a5484e06e8e51d21cdc69697cc9a99021c343897dd2b76408b3e8b3c3fd9d25830340190fdae51b0b2ca779b23d105a1654b7a9343 SHA512 ba6a513c69f8b284cf43a71b2fc3cde43ec89f542073c2b8273e9b7a8f96c505a0cf8f62bc8fba2bf0957a1d8f6b68ab625419c0f7f4ea6f7e93b49b63b14034
 DIST web-sys-0.3.42.crate 628615 BLAKE2B 7fa7c50c8e71c6b9ac43e056f70a03ddd9532b756fda50ce2183a7f24bbf3b2ad6fbca29f10f955e0032d21aa20b966c2a292f24defc00ad9021af86c0115006 SHA512 6e0af1c1f2ba0ea63033b67c25d45ec550086ba864eea532175e4424a7073f7c2a9d006f19702cbd3369eea80bce08bc25a014911ea1d7ffcc9e3c007e711a4b
 DIST web-sys-0.3.45.crate 630993 BLAKE2B a5a72bf3785902a65a7fd65b53d696b491e9438ba4dd78d4e97f3c3d62df4144716ca09822e074f27ae5506765c7c2d547a110ccaf5c4c214da6b5a4816425b8 SHA512 d208e2271f59691b13b94b952dbce966f54ca180d09c6725964541c00684787a3610623294f81032cc931273ac655dc6163b23fda736b603ff327abd603fbfc8
+DIST web-sys-0.3.47.crate 648902 BLAKE2B a670816a41130dc1c5a202cfb7e60f281850be7916c825096a41e306ec2a221a443eafcc1a2e8d037697ee3fe564968974947fd29b026f6a565d0e542114aec1 SHA512 d8edc7e942fa3c97102dca51a2d398c616d96b7a9aba872f055e9e2dc00878f59fb7bf3c4975f527300bc7fc418f5da8a2f6ba8242a5e9f2edc445d391a47813
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
@@ -128,5 +164,6 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 EBUILD quiche-0.5.1.ebuild 3902 BLAKE2B ddf0e620c3cee6e8d1e952881cf400168558634cd264809e72731d92cce3981c8926d3f570f717358474a7b0111d93e981857aabba544ad85aa574abdb71b224 SHA512 877d10e0b406507f867c8817db7583ab8e72d4a199b35384f4302d6efce2372bd75f73063124ba197a3f4cf3c66c68fb678d19f0ce0df5c1b1b7e1d83730e30c
 EBUILD quiche-0.6.0.ebuild 3998 BLAKE2B 6c36bdc3e5c506fd779f1f1f0ce21c578c5e96a5c695f99f01d2273b353d5a4cd62c00be9ea3eb08efe27c3cdef50083687d4da632f92aab736c2db7ca04013b SHA512 a0582b3f4e70d06bf1284724f7ff0f38b02ef633a9e4442fd42c0787f6c0195b0e697473092bc7820f30cc79d8375b35918a0b250ca0e2466b850c32e62c270a
-EBUILD quiche-9999.ebuild 3998 BLAKE2B 6c36bdc3e5c506fd779f1f1f0ce21c578c5e96a5c695f99f01d2273b353d5a4cd62c00be9ea3eb08efe27c3cdef50083687d4da632f92aab736c2db7ca04013b SHA512 a0582b3f4e70d06bf1284724f7ff0f38b02ef633a9e4442fd42c0787f6c0195b0e697473092bc7820f30cc79d8375b35918a0b250ca0e2466b850c32e62c270a
+EBUILD quiche-0.7.0.ebuild 4086 BLAKE2B 2fa3ba3d1457fc29552a8148a871987c91999f562e8df793d0051eb8f2aa928f2ccac75b3d6d0cc32b8c8f55dd50e5adadb45e84c265ae45af7e1bd1e78b78ae SHA512 ddb3afaf83e8906bf9cf2f9aa4ebb2dcd416987bcf652245aae492eb7d85fcebaad2c2e3cdc57c978a8e1769b1b715919c6b2212f7a409db7d4dacf90dff7f17
+EBUILD quiche-9999.ebuild 4086 BLAKE2B 2fa3ba3d1457fc29552a8148a871987c91999f562e8df793d0051eb8f2aa928f2ccac75b3d6d0cc32b8c8f55dd50e5adadb45e84c265ae45af7e1bd1e78b78ae SHA512 ddb3afaf83e8906bf9cf2f9aa4ebb2dcd416987bcf652245aae492eb7d85fcebaad2c2e3cdc57c978a8e1769b1b715919c6b2212f7a409db7d4dacf90dff7f17
 MISC metadata.xml 330 BLAKE2B 19ab5c683b1adc3bdd7929dfd013499d670eb7456dac247358c8da9c45a907e830c17dbfdbae4a5096ee82901de9b3029312cdf5136a6ecdd2288fdde7577248 SHA512 d5c6e39e5d72ad515aa1d61d851fba6db8c01d7b808be38f9fda4fec39a033f6e9986adc20cd561a6f0a4c391111c6d80e61ef7312a1274ed526588a838cf874
diff --git a/net-libs/quiche/quiche-0.7.0.ebuild b/net-libs/quiche/quiche-0.7.0.ebuild
new file mode 100644
index 000000000000..55a9755ce101
--- /dev/null
+++ b/net-libs/quiche/quiche-0.7.0.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+anyhow-1.0.26
+aho-corasick-0.7.6
+arrayvec-0.4.11
+atty-0.2.14
+autocfg-1.0.1
+backtrace-0.3.37
+backtrace-sys-0.1.31
+bitflags-1.2.1
+boring-sys-1.0.2
+bstr-0.2.12
+bumpalo-3.6.0
+byteorder-1.3.4
+cast-0.2.3
+cc-1.0.66
+cfg-if-0.1.10
+cfg-if-1.0.0
+clap-2.33.0
+cmake-0.1.45
+criterion-0.3.1
+criterion-plot-0.4.1
+crossbeam-deque-0.7.3
+crossbeam-epoch-0.8.2
+crossbeam-queue-0.2.1
+crossbeam-utils-0.7.2
+csv-1.1.3
+csv-core-0.1.10
+either-1.5.3
+darling-0.10.2
+darling_core-0.10.2
+darling_macro-0.10.2
+fnv-1.0.7
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+hashbrown-0.9.1
+hermit-abi-0.1.8
+ident_case-1.0.1
+idna-0.1.5
+iovec-0.1.4
+itertools-0.8.2
+itoa-0.4.7
+js-sys-0.3.47
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+libc-0.2.84
+libm-0.2.1
+log-0.4.14
+matches-0.1.8
+maybe-uninit-2.0.0
+memchr-2.3.3
+memoffset-0.5.3
+mio-0.6.23
+miow-0.2.2
+net2-0.2.37
+num-traits-0.2.11
+num_cpus-1.12.0
+indexmap-1.6.1
+once_cell-1.5.2
+oorandom-11.1.0
+percent-encoding-1.0.1
+plotters-0.2.12
+proc-macro2-1.0.24
+qlog-0.4.0
+quote-1.0.8
+rayon-1.3.0
+rayon-core-1.7.0
+regex-1.3.5
+regex-automata-0.1.9
+regex-syntax-0.6.17
+ring-0.16.19
+rustc_version-0.2.3
+ryu-1.0.5
+same-file-1.0.6
+scopeguard-1.1.0
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.123
+serde_derive-1.0.123
+serde_json-1.0.61
+serde_with-1.6.2
+serde_with_macros-1.3.0
+slab-0.4.2
+smallvec-1.4.0
+spin-0.5.2
+strsim-0.9.3
+syn-1.0.60
+textwrap-0.11.0
+tinytemplate-1.0.3
+tinyvec-1.1.1
+tinyvec_macros-0.1.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.16
+unicode-width-0.1.7
+unicode-xid-0.1.0
+unicode-xid-0.2.1
+untrusted-0.7.1
+url-1.7.2
+walkdir-2.3.1
+wasm-bindgen-0.2.70
+wasm-bindgen-backend-0.2.70
+wasm-bindgen-macro-0.2.70
+wasm-bindgen-macro-support-0.2.70
+wasm-bindgen-shared-0.2.70
+wasm-bindgen-webidl-0.2.70
+web-sys-0.3.47
+winapi-0.2.8
+winapi-0.3.9
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.3
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1
+"
+
+inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain
+
+DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
+HOMEPAGE="https://github.com/cloudflare/quiche"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git"
+	inherit git-r3
+else
+	CRATES+=" ${P//_/-}"
+	SRC_URI="$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${P//_/-}"
+fi
+
+LICENSE="|| ( Apache-2.0 Boost-1.0 )
+	|| ( Apache-2.0 MIT )
+	|| ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT )
+	BSD-2
+	BSD
+	ISC
+	MIT
+	|| ( Unlicense MIT )
+	openssl"
+SLOT="0/0"
+IUSE=""
+DOCS=( CODEOWNERS  COPYING README.md )
+
+BDEPEND="
+	>=virtual/rust-1.47.0[${MULTILIB_USEDEP}]
+	dev-util/cmake
+"
+DEPEND=""
+RDEPEND=""
+
+CMAKE_USE_DIR="${S}/deps/boringssl"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+		tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	cmake-utils_src_prepare
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	append-flags "-fPIC"
+	local mycmakeargs=(
+		-DOPENSSL_NO_ASM=ON
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" --target="$(rust_abi)"
+}
+
+multilib_src_test() {
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test  --target="$(rust_abi)"
+}
+
+multilib_src_install() {
+	sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins target/release/quiche.pc
+	doheader -r include/*
+	dolib.so "target/$(rust_abi)/release/libquiche.so"
+	QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS
+	QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165
+
+}
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index 7bd57abb4a15..55a9755ce101 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.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
@@ -8,18 +8,20 @@ anyhow-1.0.26
 aho-corasick-0.7.6
 arrayvec-0.4.11
 atty-0.2.14
-autocfg-1.0.0
+autocfg-1.0.1
 backtrace-0.3.37
 backtrace-sys-0.1.31
 bitflags-1.2.1
+boring-sys-1.0.2
 bstr-0.2.12
-bumpalo-3.4.0
+bumpalo-3.6.0
 byteorder-1.3.4
 cast-0.2.3
-cc-1.0.61
+cc-1.0.66
 cfg-if-0.1.10
+cfg-if-1.0.0
 clap-2.33.0
-cmake-0.1.44
+cmake-0.1.45
 criterion-0.3.1
 criterion-plot-0.4.1
 crossbeam-deque-0.7.3
@@ -35,74 +37,77 @@ darling_macro-0.10.2
 fnv-1.0.7
 fuchsia-zircon-0.3.3
 fuchsia-zircon-sys-0.3.3
+hashbrown-0.9.1
 hermit-abi-0.1.8
 ident_case-1.0.1
 idna-0.1.5
 iovec-0.1.4
 itertools-0.8.2
-itoa-0.4.6
-js-sys-0.3.45
+itoa-0.4.7
+js-sys-0.3.47
 kernel32-sys-0.2.2
 lazy_static-1.4.0
-libc-0.2.80
+libc-0.2.84
 libm-0.2.1
-log-0.4.11
+log-0.4.14
 matches-0.1.8
 maybe-uninit-2.0.0
 memchr-2.3.3
 memoffset-0.5.3
-mio-0.6.22
-miow-0.2.1
-net2-0.2.35
+mio-0.6.23
+miow-0.2.2
+net2-0.2.37
 num-traits-0.2.11
 num_cpus-1.12.0
-once_cell-1.4.1
+indexmap-1.6.1
+once_cell-1.5.2
 oorandom-11.1.0
 percent-encoding-1.0.1
 plotters-0.2.12
 proc-macro2-1.0.24
-qlog-0.3.0
-quote-1.0.7
+qlog-0.4.0
+quote-1.0.8
 rayon-1.3.0
 rayon-core-1.7.0
 regex-1.3.5
 regex-automata-0.1.9
 regex-syntax-0.6.17
-ring-0.16.15
+ring-0.16.19
 rustc_version-0.2.3
 ryu-1.0.5
 same-file-1.0.6
 scopeguard-1.1.0
 semver-0.9.0
 semver-parser-0.7.0
-serde-1.0.117
-serde_derive-1.0.117
-serde_json-1.0.59
-serde_with-1.5.1
-serde_with_macros-1.2.2
+serde-1.0.123
+serde_derive-1.0.123
+serde_json-1.0.61
+serde_with-1.6.2
+serde_with_macros-1.3.0
 slab-0.4.2
 smallvec-1.4.0
 spin-0.5.2
 strsim-0.9.3
-syn-1.0.48
+syn-1.0.60
 textwrap-0.11.0
 tinytemplate-1.0.3
-tinyvec-0.3.4
+tinyvec-1.1.1
+tinyvec_macros-0.1.0
 unicode-bidi-0.3.4
-unicode-normalization-0.1.13
+unicode-normalization-0.1.16
 unicode-width-0.1.7
 unicode-xid-0.1.0
 unicode-xid-0.2.1
 untrusted-0.7.1
 url-1.7.2
 walkdir-2.3.1
-wasm-bindgen-0.2.68
-wasm-bindgen-backend-0.2.68
-wasm-bindgen-macro-0.2.68
-wasm-bindgen-macro-support-0.2.68
-wasm-bindgen-shared-0.2.68
-wasm-bindgen-webidl-0.2.68
-web-sys-0.3.45
+wasm-bindgen-0.2.70
+wasm-bindgen-backend-0.2.70
+wasm-bindgen-macro-0.2.70
+wasm-bindgen-macro-support-0.2.70
+wasm-bindgen-shared-0.2.70
+wasm-bindgen-webidl-0.2.70
+web-sys-0.3.47
 winapi-0.2.8
 winapi-0.3.9
 winapi-build-0.1.1
@@ -141,7 +146,7 @@ IUSE=""
 DOCS=( CODEOWNERS  COPYING README.md )
 
 BDEPEND="
-	>=virtual/rust-1.39.0[${MULTILIB_USEDEP}]
+	>=virtual/rust-1.47.0[${MULTILIB_USEDEP}]
 	dev-util/cmake
 "
 DEPEND=""
@@ -176,7 +181,7 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
-	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features pkg-config-meta --target="$(rust_abi)"
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" --target="$(rust_abi)"
 }
 
 multilib_src_test() {
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 4c50078432e3..016b33da6334 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/mswatch/Manifest b/net-mail/mswatch/Manifest
index b974da7f292d..e5a0c2e82342 100644
--- a/net-mail/mswatch/Manifest
+++ b/net-mail/mswatch/Manifest
@@ -1,5 +1,5 @@
 AUX mswatch-1.2.0-gcc47.patch 565 BLAKE2B 67e42b684d1a134cf6dc02050dfda214d4c1870d146b4499e8847cd6f76f78799c45f74b55b73857e7f381365cbaa1dd68fdcdc80c059e936beb3f058c527259 SHA512 ad46ba2610303b55a1c30060af407a127847a175e86fb5c9a292fe18874ae0a2b042982890bc013385b5bba82e723a6df64c65e53a8bad39e51c35777d370d1b
 AUX mswatch-1.2.0-gcc6.patch 317 BLAKE2B d1d5b9a1d97effc54879f74c6da34d21635ef05bedfcd8eea17c936b9b08a21b64d11b379e6c344fa92ed2703949eea840eee4ff242c8d53cf7dc9aba19db309 SHA512 5f73a6251fbc9308a02343c66a1ccf00917bd6af4469cdd0f1559fab89ebace0e24a6371ba21089b659d212f225091bdf2ff6843b4372fc9f2356add5dd555ec
 DIST mswatch-1.2.0.tar.gz 434986 BLAKE2B aa62ee594740546fce32869f86cda33d81ca8e560d418fce918919fa673431457b8c9ddceee7aecf9f410f98aca009f67e310ae25258d0f130a25d2a6a39c053 SHA512 c6774993909cb066514cb0ceb163bfd5e023d357435c6779d2d049cc9d56a278d5502193af1f4f5d6af264ff041b43b6c0fe2c400f775e8c22ed395a183c75f9
-EBUILD mswatch-1.2.0-r1.ebuild 787 BLAKE2B bc9fa5ec7afcffbfda33465ad74ad98328cd17a874274fb0a196fb118ffed6ba6e58fb8362bd9d0b171a6d3f7488cf229eeedb5eaf744c9c7d29e4aae7fb9bce SHA512 0d24dcd36d4f8ca9b56db7162287c1adf95f7807954b414b0117e3b2038c6b764c0be530892b574972018ad7c3863a2c7d0514cc46e6626f8572e79e66d1eaee
+EBUILD mswatch-1.2.0-r1.ebuild 772 BLAKE2B 840040e803dc1f1b49d006dbf21dcdf4b97febec1959d0f3613c3835ff8512274ebc77babe3ef0d78e7688863a287df4ff5bb15071eb1349cd42f5b568bfeafb SHA512 2cdc588f3c594e30027127d0deada5143c2d514498ace008865d8f072d04a7f46706371d3a7eaff5f8abf004e3146bdc932db4ba439749610b4fa9fc76aba502
 MISC metadata.xml 244 BLAKE2B 314db280fdd6fb3a0ca700f569f4771e85587aef5b7800fb9e89680794eeee9e42a61169f5fac7d75d5dae9ab3d0e8cd7786ea3321835cda05deb8341aa644f7 SHA512 39a7436f1722de611975c554c56d0a2f91208bf4a5b92e1e4c3447e194f9c4f9170add7c0809e2d14da5744c060e1a3f4cdcb97badd77c2ceec08d24682adfdd
diff --git a/net-mail/mswatch/mswatch-1.2.0-r1.ebuild b/net-mail/mswatch/mswatch-1.2.0-r1.ebuild
index 06d3a3d17125..7c542663566e 100644
--- a/net-mail/mswatch/mswatch-1.2.0-r1.ebuild
+++ b/net-mail/mswatch/mswatch-1.2.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit linux-info ltprune
+EAPI=7
+
+inherit linux-info
 
 DESCRIPTION="A utility to watch mailstores for changes and initiate mailbox syncs"
 HOMEPAGE="http://mswatch.sourceforge.net/"
@@ -11,12 +12,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND=">=dev-libs/glib-2.6:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
 
 CONFIG_CHECK="~INOTIFY_USER"
 ERROR_INOTIFY_USER="${P} requires in-kernel inotify support."
@@ -30,10 +29,11 @@ src_configure() {
 	econf \
 		--with-notify=inotify \
 		--enable-shared \
-		$(use_enable static-libs static)
+		--disable-static
 }
 
 src_install() {
 	default
-	prune_libtool_files
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5e24bee314bf..b015b61dfc51 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 6a3358a9f045..074abec879f5 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -9,5 +9,5 @@ DIST dropbox-lnx.x86_64-113.4.507.tar.gz 103671827 BLAKE2B 32bab397f2a964c63a733
 DIST dropbox-lnx.x86_64-114.4.426.tar.gz 104003045 BLAKE2B f71e9aba191f7258588aeb2cf2459eb0d9311c5c56e711f9b2932b8dfe2070cc0f1a20d3cfc9fc710ad75093e18fa494f9a42a6ff23d3e231e76edd29146612a SHA512 c9d42944e81fdb1ad315c388acdfba4b3da53bf90b6265c8ca030152c39ac0a60e8d064b1c47df7d8ecaca8b0801ad0851a2252d2241580cfc479cbf76e9fc3b
 EBUILD dropbox-112.4.321.ebuild 2617 BLAKE2B 4c3c0dff5562ba9d40f10b6b5754a5f4ee8011bc7331a0ad9e2d89997a22e00752c8a062a24a4c49404fd6b2743f814b31e792c25ecbeecd0340a4edf33ddebb SHA512 3a89190dd79b8eb50e33262c3a76fd63476c09c42cdb7026abb72e4fd1eb109c92f0f6c09903af4874cb72c271998ceb21723a6f893fb954eade67c1be860765
 EBUILD dropbox-113.4.507.ebuild 2619 BLAKE2B d06e213989e8f510e35428371d832f5a8b3828843ae8c932e563130fa79964a8e2a56d4ddab37d978e08579819f578aeffa94fa9700cdc12191b53699903e2ab SHA512 00717249a02ad1415ca9ae63dfed9d062474148800fe343a9b78f7156353b51403862cd52207222cefc9a67021c8c15509aac2d2bba9ea00de11f22bee0e885d
-EBUILD dropbox-114.4.426.ebuild 2619 BLAKE2B d06e213989e8f510e35428371d832f5a8b3828843ae8c932e563130fa79964a8e2a56d4ddab37d978e08579819f578aeffa94fa9700cdc12191b53699903e2ab SHA512 00717249a02ad1415ca9ae63dfed9d062474148800fe343a9b78f7156353b51403862cd52207222cefc9a67021c8c15509aac2d2bba9ea00de11f22bee0e885d
+EBUILD dropbox-114.4.426.ebuild 2617 BLAKE2B 3ab6af76887a88cdf680627eda87132975196762ff48d6825e72340575949ea25d095022448c86c22c93e790f89fde7c9a4c015eb68499837035f3f1a5022027 SHA512 c5667dfdb2b202382f7484aec41aecb77eef8b07675a74be492e0babba02459cc492ca0b0160703a474e4768ca1bd69a87543373f59e78e48b5503ba9aeed425
 MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-114.4.426.ebuild b/net-misc/dropbox/dropbox-114.4.426.ebuild
index a77b20f7a3b2..17ace6762e14 100644
--- a/net-misc/dropbox/dropbox-114.4.426.ebuild
+++ b/net-misc/dropbox/dropbox-114.4.426.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="selinux X"
 
 RESTRICT="mirror strip"
diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
index 84a2330498ff..b865dff8acf3 100644
--- a/net-misc/gsasl/Manifest
+++ b/net-misc/gsasl/Manifest
@@ -3,7 +3,7 @@ AUX gsasl-1.8.1-sasl-gss-extra.patch 944 BLAKE2B f48eba6d1b96ab5f7e1cdc5c2220f4a
 DIST gsasl-1.10.0.tar.gz 5946076 BLAKE2B eedbdd6a080af34581c6e793d5d6db4ebbbc10c1a31dba1edc632de78a529fc2acf2b5e4df3a7bc9a721c6bdb819aade85d65245dbb14405413b933220454a79 SHA512 8b1dc87e85dbfd0255b3b43c4b7f9c2e896cb03efe4cd4af86393b62fd193665aae4ce59e66db736722e32babfcea6d4f6ddd3c5f069dcc4210f7e9531043e4a
 DIST gsasl-1.8.0.tar.gz 4914837 BLAKE2B 89cae140bb503556003036a92dfdca1ad7adb6ca46826a7309dcc39aca5a070669f4c24005ddaa1c5f5d4d56451d7a5c5164a4333542b0af1201f3fb210501e8 SHA512 711bd87d27656834ae7e19b22a76db2b1db37dd25999cd303fe8439e23e74e87fd1474c5db1b5f97e9ab75437eeeb6167a752e9191f364f530eeabb6cddda36f
 DIST gsasl-1.8.1.tar.gz 5774550 BLAKE2B 0144b0d7b2750686f3447a9d154a2d0b7fa5261b614bce74d8fdedaca140f9d964868b57f1a67cf2f5fc446c5715bae3dcdb4e06a7bedc5b66d50fa52f62e93b SHA512 8973f5af12cc17aae76a4a2ea887d17e74e48b1ce896dfd62fde8cb874ed965d77c62d671ff86ce3217158e58a7a521b7fde9ea606f73c3a912a8973f1b204cb
-EBUILD gsasl-1.10.0.ebuild 1782 BLAKE2B 96fc7cbd743f9334e9cdf6172db96e75bfc63f4bd563f9120e1b9511ab1836094052b851016b5c6ca1c7bf2f92fd1fd132fda1c804030f0170d156db8516c27a SHA512 4ff3be53728075b8c2e8c4f43e213c18d41ab253934fb35a2c9a1196a5aed44b04f1ef3f152a95a213cc203c506d3fa03f7fa8b64b126ec2c3275a17961f1f8b
+EBUILD gsasl-1.10.0.ebuild 1781 BLAKE2B 3ee9d07aa7462cdb867f2ac6a30f39bfa6d21c27976a018afbf21aeda2a74a1b97daaeef5f1d7557df80d7d47f29fe962dc5fd502aef39578f332abab0d2e4e5 SHA512 49b4137d7ec9aa1e9869b5fa6a52aa7dbb1020ca34e18324403b09f02b5a128db4a442f9e63778d5c6d63cced7c3ab1e29055dbde5e809197caa77ce7241e8ce
 EBUILD gsasl-1.8.0-r1.ebuild 1840 BLAKE2B ee6f2e8631f11e3feeaa08b3536d7398c3dcaac7757a47c26cabe85a677580d1dbf381c61d207600a9499b5b4c22130e38fbf277a6a8e7519bcc64b265994633 SHA512 bb91d61532d7743c7bd97707e24628cbcacbf02accaeeb74af9a0621f0caa014824de4bfd3681cf025d533858883adc1d9b157a024cf7c653cb5b6d25a6d8702
 EBUILD gsasl-1.8.1.ebuild 1840 BLAKE2B cd9a24685a71838e915ddaa90921c5e9f4cc94e487fbf9b86ba33dd0ffa91521a5700f2b0f378c9c7463372320393febc3896814677820343202cd672cdc1fa5 SHA512 dade3867fbf769c5b4dd2cac931f00c1b48c5a8aa9309bdb7f54a22eb78ce354476d42485787a0b35018010fb6eed6edeee5d7ced12fc275d7df7c6acd84fe64
 MISC metadata.xml 370 BLAKE2B cb234f93a667fd37ab122fbb8ae0926fd0bacda2d9e4f1e50de9e8793d6ed01f0165e16dd73931114aead2e408b2f019c06cdca7aa41d9e60c9d60cf9f7e9955 SHA512 c528d4a5f51ebcbc5917268964716d667b71e825815bdc0dbd627f1ef676b21312caf442de31e7912ad57f5c908471a7fad1617e129a2902134a081e91bcc4c0
diff --git a/net-misc/gsasl/gsasl-1.10.0.ebuild b/net-misc/gsasl/gsasl-1.10.0.ebuild
index 058ca1ab6747..848d621502e0 100644
--- a/net-misc/gsasl/gsasl-1.10.0.ebuild
+++ b/net-misc/gsasl/gsasl-1.10.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnu.org/software/gsasl/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc gcrypt idn kerberos nls ntlm static-libs +threads"
 
 DEPEND="
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index f0c129ab79d4..0bcf73d5b056 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -10,6 +10,6 @@ DIST iputils-20200821.tar.gz 504852 BLAKE2B 3ce31554937e28ca3edd204b4b4ba2d11a5e
 DIST iputils-manpages-20190709.tar.xz 27588 BLAKE2B 9780a96dfde077625a7a499182511066ede63ca364d2de729403354af7cea6b25629da1408ee2081f9da1b21756ee956d04642ea36d05ee02ef7ef05b66c1ad5 SHA512 4de796666426574bd134f4c4ea4d560d8e3eae8bd8ac19b89793fe252a1ef9eebd1833cafb72a2987118f3061eaf00da8a2468e8bced1568611f9391a1203066
 DIST iputils-manpages-20200821.tar.xz 19200 BLAKE2B 7d139ccac181eb3d74e3dcd2ba28cb906a0002aa4922de3e37771e2063234fa12428fa44bab3b50e43c40576a66d585a7460cf550afbeacd665fc41a3333d11a SHA512 0dd385565c9a15dfce668d637e055004a347056ee56260a4e726e7aa5ba5a6374aea8e9fc848dfe36b7609e5d92cb8c21f3e88f2d63e7cfe299489e41a17dc33
 EBUILD iputils-20190709-r1.ebuild 4987 BLAKE2B e3eae89daf8659c2b2906f1dd4fa12216b19ac2525fc5e11a7f43fc03794959813442c1a95d5b66dba1adb3850bd8b3022767b677e85e92e116a459cf6c2969a SHA512 e7857644e9f152d1d02e951f113c52bfbd7a21444d8ea302d986cbc777c936a9a687fb7dde8637defe95be71acf19b26bad66b346489db8d01050a795fb4c204
-EBUILD iputils-20200821-r2.ebuild 4416 BLAKE2B 3b6053527978f651a281e431ccb9cd42fa098118696c2a9008b0428784e9e8dd77a3b27154c33b425204c16976cef162b04b4cadb5991d3e24456d21e18a7157 SHA512 3efad2ee4e6a67a3b3be3b0aa2d12e478c35856ad11aad2e8b0bca00311e7af807cf53ffe335c8fce129ad4ecc0d6c18e632af653b510ffe6a95571992f4ef4b
+EBUILD iputils-20200821-r2.ebuild 4415 BLAKE2B 99d4a0764883b8225d73fe365c90931a8046a3b885f79a63be98e580ff5f055a1c5a7f4d7d85a34f53548bf2034791f93cfdf89df371626faf61d8cf97f9a81c SHA512 074fdcaff159f5f33e581fea8e8baf4e5ed3dd5ae1ca418dfc8cdddd33b3a78ff9d3b7b1eeb7f8e6ca49ccbc580924e3c57440d18ac91cb1db79351165a79c11
 EBUILD iputils-99999999.ebuild 4262 BLAKE2B feecdd0bf22c8d073a0bf7518a331a98ca3f25b3369a0c3b423af8ff6daf4c4cd784bea2b2c3778ad6afaa01945ab847ade6de2387363b49ecb69f9c2884214e SHA512 393681126d1272b16700ff36bd9597d66cc7000255eefc9bb48a4407869119dbdf6060bf57e29eb32279986552bfa10de4fb2a45be8bd495c4af37457fbbd2a3
 MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e
diff --git a/net-misc/iputils/iputils-20200821-r2.ebuild b/net-misc/iputils/iputils-20200821-r2.ebuild
index 5219577cf6b7..72b4b320daa2 100644
--- a/net-misc/iputils/iputils-20200821-r2.ebuild
+++ b/net-misc/iputils/iputils-20200821-r2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index 8d04b37535e8..61651bfecb0e 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -6,5 +6,5 @@ DIST ipv6calc-2.2.0.tar.gz 1546946 BLAKE2B 90dc600c1e83affd6138bfc73ac77160e35d2
 EBUILD ipv6calc-1.0.0.ebuild 1546 BLAKE2B 5dbfbd9a1c5954e104ed571625e8b34e3c2901e0695fa832695110e2d11969fc0ca7546ed61569f51af8cc11f1d03b88f6e8470cdbc7ee49cb6937cc37582a20 SHA512 635473dad2289ad635734e063b20838e42d21e67e59bb425bbb40a30b479bfdf094cfb78c465ed3035a20a70df1460c35d068d6841eec786706c8741fea18079
 EBUILD ipv6calc-2.1.0.ebuild 1584 BLAKE2B ae3bb846df423a60cbae3b1eeecb3cad8457ae7deb438f66003b3d6b60f7ba2619fbf92b1e0e316e2467069bebfa79a01eff90e49cc0da851b5e8ad21a0e60b9 SHA512 0597cd98ff378014e90500c15a99feac6a1318d70c37211c2303f854e5b39a5994f9c308586f060da60adf18363dea7f2c29ae108bbb8a9b2a8f9f4edcb4f1e9
 EBUILD ipv6calc-2.1.1.ebuild 1587 BLAKE2B 1321402a089cd45d8e042f97f1a308dcd812ce556beb927954542bcada2f05775a940d1f746a279a6ae8b9610bc439d84c119402a9d6ef8da7105e83719d39b0 SHA512 a544c4bdb1cccfd97e6887d4ec2dc15e87cb92d8710cc3a5bbc1c5429f20dbc64f67d4488b8eb44ed353d9c521c4404b3463b9a2b8e4e76d966a3f2f4de89f25
-EBUILD ipv6calc-2.2.0.ebuild 1637 BLAKE2B c3cde0645cf2d7421767aa48073e2d894cd8fa1434ec44108e0a80dbb19e0d856e9cc20b2a3d196ad687669f3f98aa0317482aa2f6b4b0c541c7bb0a3f3f10e1 SHA512 0a4e972d25b69772527e0c1450967a323ab0669a1589c6b62f3958c5df88f6a60b1f7bd45ca45b10bb5a5e22cbc92e236737d06b252fc172d49fcd6280f2133a
+EBUILD ipv6calc-2.2.0.ebuild 1636 BLAKE2B c48210e5881ad2ef0a5a2bca198b93c193a58b6e2cf865af91611145660a93712aa4e76a475280f9128412d505fc3d55bbba7a7fa2adba88482985bf9a0c9f2c SHA512 672b1c01ce61c31a10dc116b99b10936835a7737abd1dc212a56e967c087521d126a7b893684d650ddde503c45424a03d0c1a728a4c25a0daffb376945e1e9fd
 MISC metadata.xml 334 BLAKE2B 78e76af76293fbb24c7ad6bd4f884a67d449c26d4fd7b4ff220a324f5d421c51d56d53800b2116a02777e59c3d6f4a353823c3df31073c9676443c9816fadfe3 SHA512 ef70d2c2da48d173396b2dbb2e13104ca57e7c9ab81150c07c3c166604168984d37934815eb34a4e26c2cadbdbdcaea8983141c6eea6a36b26dfb4e89157ae6e
diff --git a/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild b/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
index e08d33c2a5b3..d436e8250327 100644
--- a/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-2.2.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 @@ SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="geoip libressl test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index 85514fc90ad3..6f139e76f85b 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -2,5 +2,5 @@ AUX suite3270-3.5_p8-tinfo.patch 2733 BLAKE2B ea2d966d5138e33289d803223a4e49f4dc
 DIST suite3270-3.6ga8-src.tgz 3296047 BLAKE2B 98bcee4591c3eea12c7127aa2eeb39613f6f090c041ceab7a7b0f1bf0e946c3048ba2f93eaacf2bbaf04b44ba78a8895f6b7acdcf20baea19a408464f83f4d62 SHA512 88a00bec19ae7be92e5bc0edd6ae1e27bef7fbbf8c3f419efda3ba2b3a0cb5e72693916cd44d50166d5745ce0f9d8497641481cedbb0bb3149567b6f51b1a987
 DIST suite3270-4.0ga13-src.tgz 3317494 BLAKE2B 898f279143006e1fc1f470bda3917afe85957de745676dc915f9c94292824ba0e10fc2ccf0a47e307c41e48741a3da7c066c45f63c917295e0522122226b79dd SHA512 bdf9c5d129419c87b45907186e5f158d8623009151357e4d8a3d08ffff2f3729449cead84d005227bfb32968ae363d1a29350692cabe9bf8b71f760eda3f496b
 EBUILD suite3270-3.6_p8.ebuild 2126 BLAKE2B 6af9b8a731e933740f3ebf1f260251d7c91806f32bc70f3bf26a914227c7ef7bd9592fb898f1a8e2fbb7eeed0c703cfbd82a2bdbe0973512007f674fc2b8b908 SHA512 6d834fc4455625b414b2b19b509b71dc6a19501ff301fe15acb49c0e0fb632ef5d3ffac10e72e7ea593c00541c4bf0010a526d9c14c6e9ca077d76ef09672a33
-EBUILD suite3270-4.0_p13.ebuild 2048 BLAKE2B 1c6734e8d180f58f0dd931751d4127a9cb7b1356086751a19ccc1db495a5b61ca74277a162446e8ea5f0e852206f95a377d4ad768b729aecf6ff6d72700cccef SHA512 4371131f043163434e4c81834960608f263b118b6bb372fe645ba8efec2ff1da920bb92e214b02b9fea3852c8286f2156d11b0a2688d689b001820ddb8651be5
+EBUILD suite3270-4.0_p13.ebuild 2047 BLAKE2B cc106c4b4dede80f90badd68c15af7a2f50f206b0a379964dd90d3e194ace955c4f4a5d3249e5ffc70f353f1c846e264dd4971611c2d85cfc55d6d8e505947fd SHA512 7d8c5b87687af30241b7fe2d5add68e942eb05225d3d9f3b475d85f36c973ce9a7f7b26f416b5b545bca02fb9b485e63d309d997ed706e2109fe30d3353f1633
 MISC metadata.xml 463 BLAKE2B 5035d30c690419dbe52b4caf68981eb40c858f09787189439dda81dd57096276a029201b0ea3eb67840a14552d9c4dcf21eb00003ea530b79b85219cc607c19b SHA512 ef297d66d1c0b2c7ab6f8d0c489f355267124cd1f0cc09d18cf1b2cd33458be4c8e1716e84753ba6e49903a90fb676fb7ae908205672f927656ebd9c11879e45
diff --git a/net-misc/suite3270/suite3270-4.0_p13.ebuild b/net-misc/suite3270/suite3270-4.0_p13.ebuild
index ff984db47f34..3c7df279e0b3 100644
--- a/net-misc/suite3270/suite3270-4.0_p13.ebuild
+++ b/net-misc/suite3270/suite3270-4.0_p13.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc s390 sparc x86"
+KEYWORDS="amd64 ppc s390 sparc x86"
 IUSE="cjk doc ncurses ssl tcl X"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 6b6233e39362..f47bd1581583 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -1,5 +1,8 @@
 AUX teamviewerd15.init 282 BLAKE2B eaa5844606cab7942d8117a7f62687f1ba2b3ff5deecf61903d9c01ea5434c8104eceb2e50d1c7a4b93089df53c98fab38da6e6e5f4ee8c18426a7165b9cc465 SHA512 bc2271c1fb360129bf0452950340389e434e420830d7d3f47dcd248151dbbadf798c025d4e47fe311857c070f3dd7b12f0092fa09508f0300963c6e04d8ed7c8
 DIST teamviewer_15.14.3_amd64.tar.xz 13216052 BLAKE2B d5fa55609a2bb6257c1fc95ec9dd3f330a4729c2af230600730fed06239b5cf2991733958790e254edb1d83191fd3467ae4b82547b089208799ee264c913506b SHA512 2bdeb5563c48595ed6bbbaa21e3ab63f670da082bcef297052f974c62c15ec085385d055f9be6a6fabaa61aa57d213a8dd0aaa1700f9ff20ad8ced0655684d4f
 DIST teamviewer_15.14.3_i386.tar.xz 13733488 BLAKE2B 14def908b2c2e86b49649264b0eab4b15594e15425b98333720f0025a0530cf3e2c350f54b996f6d48a6f44dd368899fec95c38ddeb6b909992fecf80a2bdc46 SHA512 02a2843424a19252546ce0598f0ec52dd4a0d02148e379c944b7976bba794858cc1ca58724bf5b9828b6dd38e3f3989bab8b17d7ca9285596fd450d2ce753668
+DIST teamviewer_15.14.5_amd64.tar.xz 13224544 BLAKE2B 2cefeebce0a4c31ba84e554882400ee65b6a44d7c335125cd25dfd4e9e4aa02b34708d679873a52b31e46c5157ac7d6a89d8b77848453fc7733f8931964202fc SHA512 723a63d9490df367c3f072da9ed79d84e38de60c67ca78c10b01612f48fe1afe0d379b414f898f342ddab336b9689d2f38b76d9ff83654a789e8059b2da886ad
+DIST teamviewer_15.14.5_i386.tar.xz 13724612 BLAKE2B 09558e5bc3b5db9ac57a038af14eb56816a5f272a637cfb3f73bfe072836a3011ff14f5e8acdd50889d66a9422fdc0d14f50eccfa908c6e796544d93f30961ed SHA512 5c38cd3106adf69c6b27d8696ff6c3d49a1a1450e317b07af20e7b2c2351102fcd6a0d61a9e1ce1f75968db048461adcb3dd5d5b0cf98b3de94719ccfed93586
 EBUILD teamviewer-15.14.3.ebuild 4057 BLAKE2B d0f1fef8731e318303ed6b1c21b1756f24b2ecbc8946f18189199bae20db2b7581c22467f550f5880194a68a908361990882dfbdf23ad415ab18f0ea92dc2ef9 SHA512 d470a0db96124a5fab21a8a102e8a32139e3eb809e4ac0aadb34a5f97c85636f6eb739fca767ce53f9d7ac71c363b1baa833c87aa2e82282ca2c4b52d756738d
+EBUILD teamviewer-15.14.5.ebuild 4057 BLAKE2B d0f1fef8731e318303ed6b1c21b1756f24b2ecbc8946f18189199bae20db2b7581c22467f550f5880194a68a908361990882dfbdf23ad415ab18f0ea92dc2ef9 SHA512 d470a0db96124a5fab21a8a102e8a32139e3eb809e4ac0aadb34a5f97c85636f6eb739fca767ce53f9d7ac71c363b1baa833c87aa2e82282ca2c4b52d756738d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-misc/teamviewer/teamviewer-15.14.5.ebuild b/net-misc/teamviewer/teamviewer-15.14.5.ebuild
new file mode 100644
index 000000000000..4636957e3f98
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-15.14.5.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=${PN}${PV/\.*}
+inherit desktop systemd xdg
+
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="https://www.teamviewer.com"
+SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
+		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
+
+LICENSE="TeamViewer MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	sys-apps/dbus
+	!sys-auth/consolekit
+"
+
+# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html#8332956
+
+RESTRICT="bindist mirror"
+
+# Silence QA messages
+QA_PREBUILT="opt/${MY_PN}/*"
+
+S="${WORKDIR}"/teamviewer
+
+src_prepare() {
+	default
+
+	# Switch operation mode from 'portable' to 'installed'
+	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
+
+	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
+		-i tv_bin/script/teamviewerd.service || die
+}
+
+src_install() {
+	local dst="/opt/${MY_PN}" # install destination
+
+	# Quirk:
+	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
+	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
+	# when changing the ABI of one of its dependencies. According to the
+	# TeamViewer devs, this binary is an unused remnant of previous Wine-
+	# based builds and will be removed in future releases anyway
+	rm tv_bin/script/libdepend
+
+	insinto ${dst}
+	doins -r tv_bin
+
+	# Set permissions for executables and libraries
+	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
+		fperms 755 ${dst}/${exe}
+	done
+
+	# No slotting here, binary expects this service path
+	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
+	systemd_dounit tv_bin/script/teamviewerd.service
+
+	insinto /usr/share/dbus-1/services
+	doins tv_bin/script/com.teamviewer.TeamViewer.service
+	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
+
+	insinto /usr/share/polkit-1/actions
+	doins tv_bin/script/com.teamviewer.TeamViewer.policy
+
+	for size in 16 24 32 48 256; do
+		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
+	done
+
+	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
+	# have the undesired result of installing subdirectory 'doc' in /usr/
+	# share/doc/teamviewer-<version>)
+	for doc in $(find doc -type f); do
+		dodoc ${doc}
+	done
+
+	keepdir /etc/${MY_PN}
+	dosym ../../etc/${MY_PN} ${dst}/config
+
+	# Create directory and symlink for log files (NOTE: according to Team-
+	# Viewer devs, all paths are hard-coded in the binaries; therefore
+	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
+	# <major-version>')
+	keepdir /var/log/${MY_PN}
+	dosym ../../var/log/${MY_PN} ${dst}/logfiles
+
+	dodir /opt/bin
+	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
+	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
+
+	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		elog "Please note that parallel installation of multiple versions of"
+		elog "TeamViewer is currently not supported at runtime. Bug #621818"
+		elog ""
+		elog "Before using TeamViewer, you need to start its daemon:"
+		elog "OpenRC:"
+		elog "# /etc/init.d/teamviewerd start"
+		elog "# rc-update add teamviewerd default"
+		elog
+		elog "Systemd:"
+		elog "# systemctl start teamviewerd.service"
+		elog "# systemctl enable teamviewerd.service"
+		elog
+		elog "To display additional command line options simply run:"
+		elog "$ teamviewer help"
+		elog
+		elog "Most likely TeamViewer will work normally only on systems with systemd"
+		elog "or elogind. See this thread for additional info:"
+		elog "https://forums.gentoo.org/viewtopic-p-8332956.html#8332956"
+	fi
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 1bfcad95524b..341e911b7767 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index 6884221449c2..5f9ba91104e1 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,5 +1,3 @@
-DIST gtk-gnutella-1.1.15.tar.xz 19606508 BLAKE2B 3c699f2c5e8b6962265c9fc9bc6720d740c447afb33bef8968e8c8f1f7ec8b88ec3381419cdcee8e2ec8f4e10be2c6e5707d5f89365f347a33990fffd0f18395 SHA512 6b2bee08fba463b66890c8c5d7f7815a8cc4106824e598bed8cffe4601b1e591fc14903ce8d587815257f795c854d459b3a4fa7cc90de2fbc109daef025e5968
 DIST gtk-gnutella-1.2.0.tar.xz 20467452 BLAKE2B 8884c74e5c7ba52ce870289579cb26608fd8eb0fff14986fba40e200181e28908aa42c7a345f1c69dd5b1099135b4a0458d266abdf94361cc0a37b8949867322 SHA512 8d4da23acce22af42b39ca4af2ee4d250cadea9f8c549d712ffdfb797b53311ce8db9fcb38bc1f5547b7df32e95ebc53676bff1127805e867b23d0598b1fa4cd
-EBUILD gtk-gnutella-1.1.15.ebuild 1889 BLAKE2B db599d86c14d85badd9d7290c9b717a9b19376c26d233d15d5b75de6c66fa828162ae554bc01e14b418f3555c414df1912f02a70f1e92ba028a63e61e65ea2ee SHA512 c5efa25051678b375791fbd30f7bad7886a4dcc155f8b22fd5af43c898614f84c1a3c6c048e0c379e6b3d6b95d0a0c8b68cd12ab38bf2aa71a72fb35a413304c
 EBUILD gtk-gnutella-1.2.0-r1.ebuild 1896 BLAKE2B 0e309ab81fdc61a7c6272dbb762e863ecd4171cf01d816bec3366f6af90a0a3650ebb78906dfad8a477d6215b3ec69f2784f1d5876b7d2ff4a538efa262cccf6 SHA512 8814fa8547f18065fa3a7b115936e9a11eb4ea00363a2423a3fa7cd5b22dfc92537fba849b3325b483e715b8c43d34e6ad70a05a3b0c8cef49f81361dde280a8
 MISC metadata.xml 299 BLAKE2B 8e823e2ff9ff16738e4f1d5a5e04264557ee9529ce035978e59a8d1371a8dba5485bde5095e05346ddca410d197e7fbb62f8b651bbe8cd0815396fdeda7935ed SHA512 ab18fa3318fdd64a0e4bff392a88d9f58b1c611c71ee090a767a4a25f75f273dc60a7cfeb7e386e5fbed548d982788c16654584938aec8ef5f6b11cd6d5b3c61
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild
deleted file mode 100644
index 9e60d5b50ee9..000000000000
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# eutils: strip-linguas
-inherit eutils toolchain-funcs
-
-IUSE="nls dbus ssl +gtk"
-
-DESCRIPTION="A GTK+ Gnutella client"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-RDEPEND="
-	<sys-libs/binutils-libs-2.34:=
-	dev-libs/glib:2
-	sys-libs/zlib
-	gtk? ( >=x11-libs/gtk+-2.2.1:2 )
-	dbus? ( >=sys-apps/dbus-0.35.2 )
-	ssl? ( >=net-libs/gnutls-2.2.5 )
-	nls? ( >=sys-devel/gettext-0.11.5 )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	strip-linguas -i po
-
-	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
-	for ling in ${LINGUAS}; do
-		echo $ling >> po/LINGUAS
-	done
-
-	default
-}
-
-src_configure() {
-	# There is no option to turn off optimization through the build.sh
-	# script.
-	sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh || die
-
-	# The build script does not support the equivalent --enable
-	# options so we must construct the configuration by hand.
-
-	local myconf
-
-	if ! use nls; then
-		myconf="${myconf} --disable-nls"
-	fi
-
-	if ! use dbus; then
-		myconf="${myconf} --disable-dbus"
-	fi
-
-	if ! use ssl; then
-		myconf="${myconf} --disable-gnutls"
-	fi
-
-	if use gtk; then
-		myconf="${myconf} --gtk2"
-	else
-		myconf="${myconf} --topless"
-	fi
-
-	./build.sh \
-		--configure-only \
-		--prefix="/usr" \
-		--cc=$(tc-getCC) \
-		${myconf}
-}
-
-src_compile() {
-	# Build system is not parallel-safe, bug 500760
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/bin
-	emake INSTALL_PREFIX="${D}" install
-	dodoc AUTHORS ChangeLog README TODO
-
-	# Touch the symbols file into the future to avoid warnings from
-	# gtk-gnutella later on, since we will most likely strip the binary.
-	touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" || die
-}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 14a135eca55d..0707b2a566f9 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 3b62bc4afead..f6d9a14691f8 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -6,7 +6,7 @@ AUX tor.initd-r9 942 BLAKE2B 1008ed981e1e7040b098f5c8c509e6a5de89e94b6fa110998c5
 AUX tor.service 1050 BLAKE2B 7f6553b9f4b928f0c924d73ee6f9df8a99ee75ec1801f6b865a7d8e40ff30290bf836907b561586d0f429b7ddf05286ab51974d207906a0fe52cb2fbcc8e160f SHA512 786481b20d7cab9696656c5136ff74c9c2aaa73ca3d63b163a294b9b3c4b628da387cb5ec3ada81277ca81cff16ead5162f3b4d64cb0d773c22f2e4607c3194b
 AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9d1fee71aa3b4faa425274437f8a7c2f9c608b4f8f9be6d4dd7c7bc4a58bd1ea096353e698 SHA512 7cf8c81e2e84b12bfc1242782b370335041f566165be6d9742d10768f0541d921caa378c6429fdb55f2c3e1433141f65bc936795126e677cc0921ce82de22bc2
 DIST tor-0.4.4.6.tar.gz 7806477 BLAKE2B 8eb5f22825193a61be42105ad32bd82e662c1859971fb2248fe05da2f80d1a3a9cbc96ee4f47f4127da56c328f5c60a6f57d5641cfa90b79becc8bf622f56f3f SHA512 84f981bed6d8c89d3de437e35dd2ad2ca3ee5efd7ce6b78e3e00bf40f644f495b960a7a741be5dd7ba096d73d5f941974722a44e9d3ef4fbcd02b20274d565fb
-DIST tor-0.4.5.2-alpha.tar.gz 7909432 BLAKE2B f19054c504dabecddf3ddb1b7195d5a37083ae0109ceb670af174a3876ec6f31d1a2ea0c0e8e5847d21e7ae5366f0e90aab72f91391e3de18a03639349bc46b1 SHA512 ca3f55522b198fd69abc948ef8c9dc14106b7cf6dc38f9308ca7188c713acaa07ac41c532621fc25934bf146721db99d80ca6d0fadf4a5bae7c7931a035341b9
+DIST tor-0.4.5.4-rc.tar.gz 7914739 BLAKE2B 87ecd30634091c3cf0410e14192b388ac6ea060fc2b9d1f37b517f47bbbac721c9cf7894cdc8ed7525ee1e628e4f5d0475c5e912675211478628b46acfb4ef48 SHA512 e2434b384829c2f2984ed14f3aaa11508212eeaa433bfbdb6c1630b91ef87da89b07e2d72689eddcabb45aa828773b895594bdf23dfaf2c5eb527e6369628aad
 EBUILD tor-0.4.4.6.ebuild 2396 BLAKE2B 222e94672d20bc9b073b668a84ee446c9c2ea3161da990e2599119046d3586c1e781f75f4f8617c2f224072c3f8b50ff8b4fd3a6529535eceff072cbd12d4104 SHA512 d5e477251f5d13f48c4f46adebde4c24ebb89fb80547ee1719f534fa091f65f3444da25d4ebd717e24b37fe63387d5ea3af261949822482f45bb8b2205ac84aa
-EBUILD tor-0.4.5.2_alpha.ebuild 2347 BLAKE2B 87d97ba428f73fc7d8db86339500620824ab5f87d76b5a135931b39f4579061d3238790b34f08479f512ddc124871d777dec2453e348910b5132fe4ce870be7e SHA512 0ad5b1b7bc105b155c48452d974ff6250f27345b948e69b1b145b422413f087aec961c650f43f6706e2b1834092abbf23800d2800a1879715e5f3e1f284a4272
+EBUILD tor-0.4.5.4_rc.ebuild 2347 BLAKE2B 748c868fe10e2ba502f88fb2ed607c19334ce0d7a6b97e0e76ce52a6e51fcf9169bc6ccc3f6a06ba02f4a4011fc64525fe61ae95c0680eb21fddca0b945d7ae8 SHA512 6df906de9f7865ac6498f6d8aae0f6997b4c55310af0c8f47abb8f8ce8076670e14b174a3cb13b652b1b896dd2cde51482789c90e5bbf37f26e88e4b816faf98
 MISC metadata.xml 603 BLAKE2B ec373768719960730196a7c66d762b8fb1d4b215d98ff963bb610f4eb2ccb5dde4134306bf467af9463de4640d1da50364dbeee31ac1b3facba0c484519d1f86 SHA512 c7877f120e63daf302fe3cf0b153a6a3488dffab7c05cb254a9a0c95a8b578bc72623bf12ed32790ef8abc02c692b445c068645bd1fb45b8478e6daa4e0a4542
diff --git a/net-vpn/tor/tor-0.4.5.2_alpha.ebuild b/net-vpn/tor/tor-0.4.5.4_rc.ebuild
similarity index 98%
rename from net-vpn/tor/tor-0.4.5.2_alpha.ebuild
rename to net-vpn/tor/tor-0.4.5.4_rc.ebuild
index 689cf47c9f83..63ea086b109c 100644
--- a/net-vpn/tor/tor-0.4.5.2_alpha.ebuild
+++ b/net-vpn/tor/tor-0.4.5.4_rc.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"
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 3880e1b843ad..05c79ea97cdd 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index e35a2e4cceb4..b128460afcfd 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,5 +1,5 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
 DIST blueman-2.1.4.tar.xz 983816 BLAKE2B de8d475b0aec5b037df43fdb76ebbf4fdb05367f166c14cda818badf49376f2a91de246f991167a57ecaa82a84ac84b4e91f600237c35d86e27431a760192996 SHA512 b8b54942092c1984cfac0cf73e2ac23f7693cb3ee0aa4cfaab1fa0282de4afd539f6860d5541523b542956b2efa31da3ec012dcc39d92fd699d0b8479df641ff
-EBUILD blueman-2.1.4.ebuild 2915 BLAKE2B 6ec92936f2ef88b6e0af682cdc4a832f83ae8c66ea1d592f3a8cdbf804850962b35cec7c3ab4d25bfd80d72127fd8e7090e9a487ba8a43386ccea62009d77843 SHA512 b326218e1259fbae2bbcff946158d96b120521c0671b718f5954e31d8a3890493bdf0291f9420322af39a1571059d7baab953b8adcbece670a164b75aa1046b9
-EBUILD blueman-9999.ebuild 2909 BLAKE2B 858c193450ded8606ee6d70da3faf7eaddddf118a94fe3055f0ed3cdb59c594e11d744572414966fc38d4d83df55ee80f12f6fc7ad26fe7fe99d38f4964a85af SHA512 43d34a8c0dcbda16c8dfca6cb0ccfc9ee53aef9cf2742958d72c1162b9041f3cb996dfc6b786c03266cc03a39015f44810f4cd3db2b60f5f146be817b192271d
+EBUILD blueman-2.1.4.ebuild 2911 BLAKE2B 0466450ab9b1dd3e505e6b016b63b5ddce1b54db4c0611adece1dbd0c6c6cf5a638290eaed22e450852b65d0f1cdef652b6c4ca4bbadca49fa5986800d2b5ad9 SHA512 27dac66a0403dd54b179b721b623703ccffb6b5d840d48dda11ab63d503318fb316e1858b743dee31639d921a651d872b053185f5c5ce570ca7de028c543da98
+EBUILD blueman-9999.ebuild 2905 BLAKE2B 3d80557bbad6913616edbb090de49c365a99b139487acd324a07d1f781f0c0ddc776b2e6a11ebc1c118198f8e112b8b8545891bf3c2e97d2ea9c39ce9c40618e SHA512 8c344268760aacebcbe34df0e3423a11db515550f44bb54622f1c06f4249ea5a3492cb4cd83d31d47d6d9637a6c72a4f72c57d47154863d8b6fb67e9d05c1ec0
 MISC metadata.xml 498 BLAKE2B 09bb34c58c2be38b24d8fa0512f2dc2c0456b220d70d7a26a1df335dfa4320f5d4048294f4d0da96756f0456d4f1fd66f5d9d17f0f2856f0f23a02198d9a9956 SHA512 841624c8939029603a24fc35db8d1b4d0559eb499c37cd1601b55f6c28f192a736b1199f33710b0028013b5fcf83310456dd42e3ded7896592f54d72cc04dba5
diff --git a/net-wireless/blueman/blueman-2.1.4.ebuild b/net-wireless/blueman/blueman-2.1.4.ebuild
index 8d6b0a615894..34209ec79cbc 100644
--- a/net-wireless/blueman/blueman-2.1.4.ebuild
+++ b/net-wireless/blueman/blueman-2.1.4.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..9} )
 inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
@@ -117,7 +117,7 @@ src_install() {
 		doins "${FILESDIR}/01-org.blueman.rules"
 	fi
 
-	rm "${D}"/$(python_get_sitedir)/*.la || die
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index d74182347545..0ab627a1c047 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.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..9} )
 inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
@@ -117,7 +117,7 @@ src_install() {
 		doins "${FILESDIR}/01-org.blueman.rules"
 	fi
 
-	rm "${D}"/$(python_get_sitedir)/*.la || die
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index fc2657f4babe..543fcf4b5ec5 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 45d909e21d85..7db985ea03e8 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,11 +1,6 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Sam James <sam@gentoo.org> (2021-01-19)
-# app-text/dblatex not yet keyworded
-# bug #766186
-dev-util/ragel doc
-
 # Joonas Niilola <juippis@gentoo.org> (2021-01-15)
 # Dependency not keyworded on this arch.
 app-text/enchant voikko
diff --git a/profiles/features/selinux/use.mask b/profiles/features/selinux/use.mask
index 3cdf71244bba..7ec45f5f3a3e 100644
--- a/profiles/features/selinux/use.mask
+++ b/profiles/features/selinux/use.mask
@@ -11,3 +11,4 @@
 
 # no policy yet
 systemd
+homed
diff --git a/profiles/package.mask b/profiles/package.mask
index 0e8d4e639b39..b0a513f1cf07 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Alfredo Tupone <tupone@gentoo.org> (2021-02-01)
+# no package uses it
+# Removal on 2021-03-04
+dev-ml/ocaml-data-notation
+
 # Michał Górny <mgorny@gentoo.org> (2021-02-01)
 # LibreSSL support is discontinued.  Plaase read the relevant news item
 # and either migrate to dev-libs/openssl, or use the unsupported
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 59b770662476..b182216d3ba4 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4788,14 +4788,18 @@ media-sound/yoshimi:lv2 - Add support for Ladspa V2
 media-sound/zynaddsubfx:dssi - Enable support for DSSI Soft Synth Interface
 media-tv/kodi:airplay - enable AirPlay support
 media-tv/kodi:bluray - Enable playback of Blu-ray filesystems
+media-tv/kodi:caps - Use sys-libs/libcap to bind to privileged ports as non-root
+media-tv/kodi:cdio - Enable reading of Audio-CD, Video-CD, and CD-ROM disks and images by dev-libs/libcdio
 media-tv/kodi:cec - Enable support for HDMI-CEC devices via libcec
+media-tv/kodi:dav1d - Enables AV1 decoding via media-libs/dav1d
 media-tv/kodi:dvd - Enable optical (CD/DVD drive) support
 media-tv/kodi:gbm - Use the Graphics Buffer Manager for EGL on KMS.
 media-tv/kodi:gles - Enable support for GLES
 media-tv/kodi:libusb - Use virtual/libusb for usb device hotplug support. This flag should only be enabled if you're running a non-Linux kernel or you don't want to use sys-fs/udev.
-media-tv/kodi:lirc - Enable support for controlling Totem with a remote control using app-misc/lirc
+media-tv/kodi:lirc - Enable support for IR remote controls using app-misc/lirc
 media-tv/kodi:mariadb - Add MariaDB support
 media-tv/kodi:nfs - Enable NFS client support
+media-tv/kodi:power-control - Enable control of shutdown, reboot, suspend, and hibernate
 media-tv/kodi:raspberry-pi - Enable support for the Raspberry Pi
 media-tv/kodi:system-ffmpeg - Use system ffmpeg instead of the bundled one
 media-tv/kodi:udev - Use sys-fs/udev rules to handle devices' permissions and hotplug support. Unless you know what you're doing do not disable this flag on Linux kernels. This is provided as an option for completeness.
@@ -5539,7 +5543,6 @@ net-dns/pdns:tools - Build optional tools (dnsscan, dnsscope, etc..).
 net-dns/pdns-recursor:dnstap - Enable support for dnstap
 net-dns/pdns-recursor:protobuf - Enable support for dev-libs/protobuf.
 net-dns/pdns-recursor:sodium - Use dev-libs/libsodium for cryptography
-net-dns/pdnsd:isdn - Linux-only: check status of ippp interfaces with ISDN-specific system calls.
 net-dns/pdnsd:urandom - Linux-only: use /dev/urandom (pseudo-random number generation) instead of the default use of random() PRNG.
 net-dns/resolvconf-symlink:symlink - Actually replace /etc/resolv.conf with a symlink. Without this flag, the ebuild is a no-op.
 net-dns/unbound:dnscrypt - Enable DNSCrypt support
@@ -7856,6 +7859,7 @@ sys-auth/pam_mysql:openssl - Use OpenSSL for md5 and sha1 support
 sys-auth/pam_u2f:debug - Enable debug messages using the pam logging macros.
 sys-auth/pambase:debug - Enable debug information logging on syslog(3) for all the modules supporting this in the system authentication and system login stacks.
 sys-auth/pambase:elogind - Use pam_elogind module to register user sessions with elogind.
+sys-auth/pambase:homed - Use pam_systemd_home module to manage home directories with the systemd-homed service
 sys-auth/pambase:minimal - Disables the standard PAM modules that provide extra information to users on login; this includes pam_lastlog, pam_motd, pam_mail and other similar modules. This might not be a good idea on a multi-user system but could reduce slightly the overhead on single-user non-networked systems.
 sys-auth/pambase:mktemp - Enable pam_mktemp module on system auth stack for session handling. This module creates a private temporary directory for the user, and sets TMP and TMPDIR accordingly.
 sys-auth/pambase:nullok - Enable the nullok option with the pam_unix module. This allows people to login with blank passwords.
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 32100a468cce..946825a91e1e 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index b688d52bf6b3..66aa1e5dc750 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -3,20 +3,20 @@ DIST gromacs-2018.8.tar.gz 29913703 BLAKE2B 8780032305928067fbfe1559efe9eedc4d47
 DIST gromacs-2019.6.tar.gz 33446147 BLAKE2B adc21fb6b841b06d499607f8c0166a673645ef5af0b40bd823d0fff5ea24397e6301c5e1e0070986ae1ce1deba8a42052b66da148b071c1e21f2fe3908fee275 SHA512 7c227a9539e5775d5d128ae9e872a24181d79cdcd2852b86453597987e8d7332ecec371da65d089f6e610c54aafbccc8824ce298743383dd6240719ebee692a8
 DIST gromacs-2020.4.tar.gz 29149899 BLAKE2B a07c8efd96137d58c1edf4ac9b5aafeb16d9e65234b9459b71471827032654acacb58ed6ae87ec6e0e593a0acd799683cc4461b06cc883b089d740708619345e SHA512 0c56f058741af70660baf0177724ec940dd984c05ea141ede91ee51ce3744f76d00e31bdb5db907e46fa1639de5dca637b3ace26e89f908c2e74c69f0c21ed3a
 DIST gromacs-2020.5.tar.gz 29148909 BLAKE2B ea439ae95d4af67a77d53182f7ddab702799edab8527c1b6ad20625d21a81f3e3c0cc699fa0b656625bffcca0bdd5a1e104aea4f592ee2db92b4f1a460ad0e80 SHA512 fe38fda36d31aef5ce01a3dbc29c9f50d3cc05b20bb34a9a8f10fda5aecde4f93ca8a3f85433139e1bb88fc23d77916a4aff5a292abaa528bd0e6138e84cba18
-DIST gromacs-2021-rc1.tar.gz 30141045 BLAKE2B 7fca2e8097be35bae3d35aa54d2793e6fa06181a471092930cc21333a11fec97a717e01ea2be494540df05687c06d25d9d2ad8308ac0913fbcfd94b72d380939 SHA512 74512ee4847b114ce6c4420f9b61af067ff9716a2c616d53cf66c6f47c8eb41ed5c566553c16392b5dc233386f1eeade892cb9e01cc9724199cef06ffa794869
+DIST gromacs-2021.tar.gz 35061679 BLAKE2B a7d8bd728480455e5c069392e3921a4f788802ec164ee24241cac9bc7c555cee07ef26853efa61e40a787fa87e6d20af35d56b98ac6a3757ef07fc4176679e19 SHA512 10d9d64b3c2329613a18d861589428841f55bede45e1800aec25246258209be1385aabaa0d5b52425c0ac21804c38b401db76448bb539ff3cf25f8b94e09575c
 DIST manual-2018.8.pdf 10025023 BLAKE2B afb0a6e6a72d78df743fcb57e7c1716848589e571dd35167b957a9b407ca27978ccfb6cb9e0df9c9439b888f352501a00ba32281ed1e0b4193bd606f1d77152e SHA512 b1972f7ce965bfc9377542993c5943ea4868a8ed23a969d4203264746d6bea3a7a65c6379196ece37fd6d68ec7ec80f827bde87d1049284af7082759a124f1d5
 DIST manual-2019.6.pdf 12702376 BLAKE2B c350127bc06a9eb3dee73da39037c84daeb89500e23cb131bd19a150bf60602d4dde7611e0c6f0f344af4093e96a899303dac71b4df56fd0c44c3a48a56606b7 SHA512 dfdff67c2c1c9ce1f1c236b7686c5331b0fe86951da6c98eddd6a3e748815e0be0a9653ae4318469fcdd913c4e7c355d64a997cc80b9d9fbe6282ef6d98e61eb
 DIST regressiontests-2018.8.tar.gz 67855469 BLAKE2B 34c9b339f6229f483afbb5192ee6ba8b8f72d5c26907a853af9c53dfece0d88739e48f6b44b78d1c010f988f9385d077285300522164f533a5861e9dda879275 SHA512 3642389d27bd1942cd0f091c940ae97b197b94856a387fe581dc516b0d4169480f16551d4ba357f9282b3337d605c286d51dd38112ac87c826dda634904836bb
 DIST regressiontests-2019.6.tar.gz 67643195 BLAKE2B 1e054e24b187946f7ea28090d4f20cf8e1d79a26253f57ba07d130e0773d8541b8a1552a38023d31a68ce8bc62d8e0af1d98609234bb3e7d3e6d567307ebb386 SHA512 eacf1c55b982515a305c29459fe80a7cd558a8481e5689962aa956148af542568b1d1ce59c6784ecb0afd4768c2b664afa21e12af2d89ae2b06b1ba61ad72036
 DIST regressiontests-2020.4.tar.gz 48542144 BLAKE2B 1dcde67525d40ababa74d9e8ba2dd3fdef1de7d1018491e102edd71d3a622925f213b5a0812e5448882b4cb5fb578317e8e5029bdc4bd53008aa8441a3d9dea1 SHA512 7c71f36a1cef22562f14dcd233e90ad2fe370ae1a7d3b5268727259b374e12d4754253735ac8745d3738bdbc1cc2067780fda5e393be2ff264f632fe4e0c1978
 DIST regressiontests-2020.5.tar.gz 48541167 BLAKE2B 81f0505090203c970178ca4eba8dfd54d942a20970525cad954833481cd79141fa33fc97e8940ca83cee104ef6b017bc0f7bbed9eddc620a86c818760b3fc261 SHA512 aba67542ed00145cae8de040e4a9074a8a359a529135180e6083b2330934962302349d382d6626bddc6971ae6d44e09c8ea44d5df55ca5fcd038055a1c3e5cc3
-DIST regressiontests-2021-rc1.tar.gz 48512759 BLAKE2B 721c495993ded1dd61242014b5dd6bc08be18cebb1c1dd2404b1837bba451189e16cd52c94e842e6052703ec0a2638149ffa7b55b836ee11fcb4378b8e58628a SHA512 41171d1f6e394b10ff426bc0e354cfedc577f75825fc2c31a67761365498a1f2e35e97d66231dd8742a8d836e77e4512dba4238ef0319c9075cfe4231e721b1e
+DIST regressiontests-2021.tar.gz 48513192 BLAKE2B e27898ef3936495fce111c8debdafbdaafae07cd9b27c8591cc27695f681fddda34f083d427e5b3afd2f318ff41201eabc915025f1fddef61ae29ceb13f37557 SHA512 e33578d32b929d516614592d0bf4aac4e518cc4f18fee4048d5b73b11f4373494c6d8aa43442e4e2be632c12c058657bce1064be82c515787d57b449c1241e48
 EBUILD gromacs-2018.8.ebuild 6948 BLAKE2B f7258bdf69131e6eff444b9025573822828e7c073086af2a7b6d59b0e140033e1c6ae5a2bb3d3827cae5e52240366dd53fbac03a447b112993d72ddaf0230793 SHA512 274386cdd1b0b14a16cb785e4399104dc2f7a21718f88ed6fd96117b6606f3249159733dc7eb8afb8def3935f43f026444014f1a64f4ff8ea0af1d4a4fb0155c
 EBUILD gromacs-2019.6.ebuild 7269 BLAKE2B 0767855a053171fbeab635ef2c90725df443d78b4c250cb8ec39ac8e7cc2b77550ca33916db655d08d17bcf9258b47a0f98af07c5f3e391cb82ee3fe501a3058 SHA512 69ca23a3b9599e5f55444e19a7478eb48ea0d48f9bbb98c6f9d237757dac008e5b62868cfe374540a902792b458c1f961e47a1b4bb4545ce412a04e54bcb6599
 EBUILD gromacs-2020.4.ebuild 9804 BLAKE2B e0e603b7a61cfe595e2afb365cd5e0282919aec2b12168da9ebab7a2096b6430f136f75bdd37dc2ab9923c8617d4a981a1db5f535e362454fc0cd1b5e6fa2291 SHA512 90857e2afc61d5a32c76e98c1fbaa341226c3f5b3c4495c632c7e7042fa15c96596b6f98aa927eb7c2190e5bdc4c80c4d752cc26410c4a7b0ce3c686d7b7946b
 EBUILD gromacs-2020.5.ebuild 9807 BLAKE2B f9baf5085050cce6339643f1a59a0eef41c41c233a91a2e605bcb95cd6f4e1993a3a987b971d80918652d882c3a498f4bde70161c18d75855a846af10b13947a SHA512 0c82201b205ce5e284a9232702eca8bbf0db20e55ff36f0484cea3d68851381576fed89c8aaa44f57a5b6ea09a0b40e1a1aab07c34a5f5a31d03aebb84ca2f32
 EBUILD gromacs-2020.9999.ebuild 9807 BLAKE2B f9baf5085050cce6339643f1a59a0eef41c41c233a91a2e605bcb95cd6f4e1993a3a987b971d80918652d882c3a498f4bde70161c18d75855a846af10b13947a SHA512 0c82201b205ce5e284a9232702eca8bbf0db20e55ff36f0484cea3d68851381576fed89c8aaa44f57a5b6ea09a0b40e1a1aab07c34a5f5a31d03aebb84ca2f32
 EBUILD gromacs-2021.9999.ebuild 9980 BLAKE2B fbd534374b2883fd921a02e317f48098b7d072774c0079db0044034ccafca8ea2076177930c96a867ffa9fbfc4de0e2a9d3634e2b444bc4480d7443188174e6d SHA512 8b93308f6c350a75458d4ed73d996b8c1e18bc461e300ea7d992d72896a37d3bac6f612a4483562ebfa0c1a9e290301c5dc8ca39fdddd52d14c881010e319fcc
-EBUILD gromacs-2021_rc1.ebuild 9980 BLAKE2B fbd534374b2883fd921a02e317f48098b7d072774c0079db0044034ccafca8ea2076177930c96a867ffa9fbfc4de0e2a9d3634e2b444bc4480d7443188174e6d SHA512 8b93308f6c350a75458d4ed73d996b8c1e18bc461e300ea7d992d72896a37d3bac6f612a4483562ebfa0c1a9e290301c5dc8ca39fdddd52d14c881010e319fcc
+EBUILD gromacs-2021.ebuild 9980 BLAKE2B fbd534374b2883fd921a02e317f48098b7d072774c0079db0044034ccafca8ea2076177930c96a867ffa9fbfc4de0e2a9d3634e2b444bc4480d7443188174e6d SHA512 8b93308f6c350a75458d4ed73d996b8c1e18bc461e300ea7d992d72896a37d3bac6f612a4483562ebfa0c1a9e290301c5dc8ca39fdddd52d14c881010e319fcc
 EBUILD gromacs-9999.ebuild 9980 BLAKE2B fbd534374b2883fd921a02e317f48098b7d072774c0079db0044034ccafca8ea2076177930c96a867ffa9fbfc4de0e2a9d3634e2b444bc4480d7443188174e6d SHA512 8b93308f6c350a75458d4ed73d996b8c1e18bc461e300ea7d992d72896a37d3bac6f612a4483562ebfa0c1a9e290301c5dc8ca39fdddd52d14c881010e319fcc
 MISC metadata.xml 1173 BLAKE2B 768befbbd08adbd39f92bb715798a7ff8d0559bb3dfc3bf58c282ae687d4946f06b32c5a75544dcc33b83e5a874538712021c8ecbee5a989a6f045d752ab359b SHA512 24363e3136b7c81288798ac01f779cf9c06c32482c0b5acd6d1c5f2a66733ddfdf35de661cedb6a23e1a5de08c012b79e6d2903172aee139a675897e5c72e7d3
diff --git a/sci-chemistry/gromacs/gromacs-2021_rc1.ebuild b/sci-chemistry/gromacs/gromacs-2021.ebuild
similarity index 100%
rename from sci-chemistry/gromacs/gromacs-2021_rc1.ebuild
rename to sci-chemistry/gromacs/gromacs-2021.ebuild
diff --git a/sec-policy/Manifest.gz b/sec-policy/Manifest.gz
index 6da47ba97077..46ce6d0f25cf 100644
Binary files a/sec-policy/Manifest.gz and b/sec-policy/Manifest.gz differ
diff --git a/sec-policy/selinux-abrt/Manifest b/sec-policy/selinux-abrt/Manifest
index ec12d730c528..621293ef60be 100644
--- a/sec-policy/selinux-abrt/Manifest
+++ b/sec-policy/selinux-abrt/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-abrt-2.20190609-r1.ebuild 275 BLAKE2B 279a8b2a8cdf4f39d019365d3d2035a85412cc0e600018e8bb5ccd3995c9800425f553b1adcbadb21a274c36a7491fd66df12c4cb0ceaf82df538b5b97339408 SHA512 7a4531e7ccb024afcd44222003a6c19631189861fc97668e73f9bd19b2e24ee85f19b2e24b20844014431f51abfe1d822252fed36a799fcbc8c47a11a7cc8b35
 EBUILD selinux-abrt-2.20200818-r2.ebuild 275 BLAKE2B ecca54fcfe343f7df5d85b87a803abc91b9d38ace8a92288ead7516fda34e49fc421a9d8dc134a46c679549306752d112b20a619d01cd415ead5eaea0ac17b07 SHA512 b2d0b4945f1d36ab8697ad4c69ac529807d150d7eef6a54062ec35e73c8c2e42a29281bd6637073b640420edae15a668accb98db8c178d33910db5cf7b57c76e
 EBUILD selinux-abrt-9999.ebuild 277 BLAKE2B d53d4367204947dbfa68315090b915754928a2c6f2f96552df58d04006e463d6368ddacf48bcb402753ea26a943fd9f00839aac80d99b2370fd6aad073585d05 SHA512 ae6112adf7383317c6136c55e4241fcca7ef9ddca079725ab1212fc6f5fe8d34b4db3c4e5da07ecdd7385e641e5a484c7a206f786f18b765428f94b2199dde31
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20190609-r1.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20190609-r1.ebuild
deleted file mode 100644
index b873a89a358e..000000000000
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="abrt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for abrt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-accountsd/Manifest b/sec-policy/selinux-accountsd/Manifest
index 9463ec137cb8..71cd9f2338b1 100644
--- a/sec-policy/selinux-accountsd/Manifest
+++ b/sec-policy/selinux-accountsd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-accountsd-2.20190609-r1.ebuild 378 BLAKE2B 9c2c18d19f10542d4b621f7b1e7ae5f1472136bc239c85c3d785ce6d39ac1b2cf29355e752fa6b9cf7463bbe709742c966e646038879b3263de722684c90a4f7 SHA512 35d15bd8bd44c087f2354ca4bb7afeec6b4faa6fd883eca82217298f1210a3fc77de56f536f5f4b30f531d40b44d2f7f9f2ed9f8e6c81fd50467e28982733ba8
 EBUILD selinux-accountsd-2.20200818-r2.ebuild 378 BLAKE2B 2741600103c709b984c1a8e8c142752142a0394f2fe1b8481e24e24b1476e27af74c439754c533a60638e573c840a2543b2d656ec0071cea601d0ab407ce8d12 SHA512 b0c47b52c34ec8989647dac6123ba42bc89eca6e4bb1c335094b2b3ccea259bd194490cf32ca3f2df2c6141b7007320ffde20eee73f705995de2c1526623fbd8
 EBUILD selinux-accountsd-9999.ebuild 380 BLAKE2B db5f57a459fa52196bf12e320a6588f443ae25f4e88442d178adc3db2a1e20d4500d98337e488c4383dab51b3abbdba6b064fbf7cfe0d0bb396de71bf489dfc2 SHA512 7b4157f345f3c9a952f79fc02b49de9826eaaed61c1abe969d73493c2df9a733e154b81c9e787c9c310f7c2b74775def433efef244670a38918b6136b8e328e7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20190609-r1.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20190609-r1.ebuild
deleted file mode 100644
index 2de7f0239bce..000000000000
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="accountsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for accountsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-acct/Manifest b/sec-policy/selinux-acct/Manifest
index 7e25bf461269..5ad28c5b1783 100644
--- a/sec-policy/selinux-acct/Manifest
+++ b/sec-policy/selinux-acct/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-acct-2.20190609-r1.ebuild 275 BLAKE2B 1667ff8303ec2d730db653ca8eef4a961d3fbb1643e4f22965ededcfe342271adad7f6b20aec854c1d44f3894bb1752c901972f58f701647277712ab812946ae SHA512 311af8eb1bb9082d8f593c0ba170ba0e1f9c0561bd9e4341b43ce0caa9f5f651c56e3f6c97a13dfc95d5fec7fbfd1eb1f952b6c2cbeac4bf349e1dd233fbbfa3
 EBUILD selinux-acct-2.20200818-r2.ebuild 275 BLAKE2B de49d9f46c2a553b2325990207c82a4a238040a85535a1ef83489c0d4e8dfc4314da11326c6fc65cda74c1e2480fe44997d6df82b4438284b183f94f5bfa67e7 SHA512 56970240a89e9632a4661ecacaa88a8c96dd5ae727c53af8c836c8d80f2ba3e94f2fa0b15eed2d98402e972336577c189ff862fa0abc30a5b2be09ed047eb2d3
 EBUILD selinux-acct-9999.ebuild 277 BLAKE2B cf252f68f808d252cca59396729e59eb068106d9fe7f90263a75ab8023769a3a8a491cb8b18e89c6ed8fcdb12cb2cf49a1570d17ee319f53bd878ad0ce6ce747 SHA512 64791bb0f70d3290e4b378557ed1f3635cb8ebd6a7e1448184f858a69493a3e83c82fadb3c71523ebdcb1ab2d4355b15257ef55aabc1c8ea95b8f5817505c8ef
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20190609-r1.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20190609-r1.ebuild
deleted file mode 100644
index afc94895c459..000000000000
--- a/sec-policy/selinux-acct/selinux-acct-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="acct"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for acct"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ada/Manifest b/sec-policy/selinux-ada/Manifest
deleted file mode 100644
index fcb444caba91..000000000000
--- a/sec-policy/selinux-ada/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
-EBUILD selinux-ada-2.20190609-r1.ebuild 273 BLAKE2B bbc93de888c74a63d210ab9fe84dc0fe230fea0bf9c0894a1cb01ed55f69cb5140ac0c98249daa2d7662a2c4ffd28a8e34ad88d57a84a838b9e866edecc54a47 SHA512 ecab6f318d15919a9208df2a152e64b1123022ccf5d8f9a09758a9855ad4b1c985062a9898168910fad612183ef1696b5dc1326a80fc11f28cfd9503f0940a36
-MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ada/metadata.xml b/sec-policy/selinux-ada/metadata.xml
deleted file mode 100644
index 9173800ffc42..000000000000
--- a/sec-policy/selinux-ada/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>selinux@gentoo.org</email>
-		<name>SELinux Team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20190609-r1.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20190609-r1.ebuild
deleted file mode 100644
index 06eec0838701..000000000000
--- a/sec-policy/selinux-ada/selinux-ada-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ada"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ada"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-afs/Manifest b/sec-policy/selinux-afs/Manifest
index 21b9b7208da8..7c27e7905eef 100644
--- a/sec-policy/selinux-afs/Manifest
+++ b/sec-policy/selinux-afs/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-afs-2.20190609-r1.ebuild 273 BLAKE2B b2976f6d44994e4e966c2ae217c38cdcb04896c9fa722459e8aee81998b89944b4cce8ca4dc1780aa515a72b8a864f3b8f962b0b11d3a9e7fcdee6a1e440c42a SHA512 31e95ddd20ee766f3cb387a3aabc65f2849295ebbedaea917f48ea63292d84f9ba74c5b0549f958f92cd46b8b0cd76d207b0876bba4e4ede19c4c5d3a6011afa
 EBUILD selinux-afs-2.20200818-r2.ebuild 273 BLAKE2B 5c34d13f0c9fa5b46758c5d8baec2ecc9bea8b9601344088d684025be5fe66a02425fe5f05d03660e477e5bc0d1bd7e15489c57a7890aac9a3e6b13f02e4eb68 SHA512 3d8403ad7467f02a2e14f5505c3c3d5974f0dc93851de204e096e1c560c79374d27f37d798855c21ceee35338d2d7a6dd86404d283b1ad3e14338d239ffb7e93
 EBUILD selinux-afs-9999.ebuild 275 BLAKE2B c4f0f2e55724d947f70686511f999c0931f8460b5fa3926c7640d032d118bb7585e97b5df32d7332df9a7ac3ca8fe1ecba0572f9332dfcee5b277f18c0d9ce5a SHA512 7f55335811a2dfa36121d4f6efdb2bf5cb9be4d7250c3f7e95b066993dae09000bcc7a25d631054f1f84ecf33e11934405aff5037323033d15680fb810419e1a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20190609-r1.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20190609-r1.ebuild
deleted file mode 100644
index 1d6c1c4bc440..000000000000
--- a/sec-policy/selinux-afs/selinux-afs-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="afs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for afs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-aide/Manifest b/sec-policy/selinux-aide/Manifest
index f0159995212f..bc1013cdcfe6 100644
--- a/sec-policy/selinux-aide/Manifest
+++ b/sec-policy/selinux-aide/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-aide-2.20190609-r1.ebuild 275 BLAKE2B a431b8374584ac5b5c737db254514e1bd0471f5f292785a5a14b3d9dafd32e1f0a83c3f46e5bee81e36ad3c553f99c4952d943e5f5e136167f35285a124d65ef SHA512 61fe18029a8e0f2c9897b83b4fa512bd47d7d03d85847a38aa25d7995d1df518c4d47957fe97b0a51a4c0d9574bd4898eb14ab3a41564abc5075f80330de12bb
 EBUILD selinux-aide-2.20200818-r2.ebuild 275 BLAKE2B 7ffeedf7f5604a1333d720c7422ca7fabcc5be9a638c4b75708d87e9e2fcfdca38aa21cc2a6f22a6ed33ccc2dcdfbd4e08167000a5f0c26dd28a05a289c93252 SHA512 35c4e5ec6358ce90404baadee2a0fb2b59a29096b1ed08c25303048d3f21efd17b770fc84f76b0d41bd54f6b24336af0bbb14f4d5c8ac397609a0c298417754e
 EBUILD selinux-aide-9999.ebuild 277 BLAKE2B aaafe4d33b54442f7f4ee2b084c42fab45231a52d36833a71ff8662968612709780ca6e3fa5a0d280e74b5a7b4ef18474d060033e370b9f2464a13b9b5e3b3a1 SHA512 c8928c7c2f00126bc52b0cd7118a6e7176533eaf9b7529b55e4681a544945eb6d2b4e8aea5d67f0ec7acb9f837bb47edddf1d7a7cb36b42e0c3ed4af4017ca3d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20190609-r1.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20190609-r1.ebuild
deleted file mode 100644
index fdbe2ad8fe19..000000000000
--- a/sec-policy/selinux-aide/selinux-aide-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="aide"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for aide"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-alsa/Manifest b/sec-policy/selinux-alsa/Manifest
index 6f6844dac439..2e3b05adbcef 100644
--- a/sec-policy/selinux-alsa/Manifest
+++ b/sec-policy/selinux-alsa/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-alsa-2.20190609-r1.ebuild 275 BLAKE2B 18c33ac526bde40d7da8ed8789c612b249f15a35b1853659f1a0e4049c6b2a22cae42fad68ae28cdc9f8fed7dc8fdd6bf778e25941992b3cd921c5348114bbd5 SHA512 d5f4a317053176310c435486b3365cc8a0aee56c5c62180d7583f0e4d6b14a6c8cbc15dcd2db6ac6d7163aaa11e8d7dabc5ba74f8a5657a9544ade61678b8fdf
 EBUILD selinux-alsa-2.20200818-r2.ebuild 275 BLAKE2B 3aefcc369408d476263b609015a0f4fdf64908db3896be1593e092ca376631db5dbe8da4d30b02f2d316a00fd5c686b2437ea92d7930d90f8db75320beaad317 SHA512 2d1940cdbdb6da6367242b281f2cc1db995df2524c73818e2cf76998b16fecd48e0a2a220db8ccd40e468a0f22c938d84c301ce1ddb38bc0bd04e56d90108dbc
 EBUILD selinux-alsa-9999.ebuild 277 BLAKE2B fa92c680cacf56ba48d67c2cc59dfac520bfc29a27c2d63995bff3dd82fda7767fc12c8c40814ad71dd61f83a7269aa881007531724133b1614b6dcad0a49b0e SHA512 ce1bb457e2963e0c1327adbcce6811972ef691b0b87f33c1c7a6c663ea9aed186119d96d9e08fc42f9798ee8457ec11b3fed3234f0ce84e3d84cad6f463e11cb
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20190609-r1.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20190609-r1.ebuild
deleted file mode 100644
index b81a533192d4..000000000000
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="alsa"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for alsa"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-amanda/Manifest b/sec-policy/selinux-amanda/Manifest
index 2b16d1fa97ec..b9d23579e1d7 100644
--- a/sec-policy/selinux-amanda/Manifest
+++ b/sec-policy/selinux-amanda/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-amanda-2.20190609-r1.ebuild 373 BLAKE2B 8c4925318ab8e00a4130eca1a18024e94f79f830dfbb387f9733e0b51b6a155cd7c8b888dc580d61457128a1846d177684acfcc09b46595295e46227d18c5f1d SHA512 f99979c7a58c93d45951b9eb669c87256e0ba471377b2d7f2dc225084e4718368a84e2fbf0805482252342591c2933ad6daa1198cc64e676468a097fe737e743
 EBUILD selinux-amanda-2.20200818-r2.ebuild 373 BLAKE2B 56076b1f8cbbbac6f25fa7ace34a9664836c56dc3226a0fc7321efe44cd87fbd783c635fd36923200eee9a5e5e1889ca445d9da7fbdcfd9fdb83f1a2223bf8d3 SHA512 e1a5f132d1baf60ddfedafa3311cc8e54e40ad0521a516f7e8f86a64d14ff8ee5eeca816a7e6b18252dce1aa07f33a32192fe9fd47a93e97548a9116ba384de2
 EBUILD selinux-amanda-9999.ebuild 375 BLAKE2B b21fd970b1c6f41928f6827041a89b79459e0fad907b8411e28dece589a985802534545cdaef006d19882a2099fbf4b0db2f8abff79a2505d8e28eb0806cad16 SHA512 4ecc380cc4bc90d87115bcb993d3e64041cf540a4be2f2667b66e2811cf1c32fd295bdaa92620c56cafc60cc7d4ec35d17d672968b36c3866fb6d058b3e01788
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20190609-r1.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20190609-r1.ebuild
deleted file mode 100644
index 4e0a659ca088..000000000000
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="amanda"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amanda"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-amavis/Manifest b/sec-policy/selinux-amavis/Manifest
index 5146706be0f4..1ee6b6f8d4b9 100644
--- a/sec-policy/selinux-amavis/Manifest
+++ b/sec-policy/selinux-amavis/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-amavis-2.20190609-r1.ebuild 279 BLAKE2B 500e6bddef3eebba2fbe8687c0350aaca692a52c957a2d89e9dbc15cfed620fcb23be402bcb9221c071f02217af069e3b2c3c3138372fe0e7be39d035d1d7b72 SHA512 e1377d9002f4f497dd2c56abd36001e422ed94d9909e4d7983a2604dbd4687eab055bc9b4a503061c1b867ba7bb7288114a8565b8d85bef9554685e99daba27d
 EBUILD selinux-amavis-2.20200818-r2.ebuild 279 BLAKE2B d60e67f3f5b8fc5712a7bcaf3e3ff17f641f3bb7062c990ca9d85285f69cfa9378f4943bdb2fab87f9a6af8095156638aaa33ab3527782c7bdaaa19db9ba51a0 SHA512 391acf6f13def9e462c9a56e405e565d2fb88a72fa47ec97e98b2821f20affb9f9c2c0a8d25d3480071180fe2363ce701911d58f2b2181a53083b76595d8cd4b
 EBUILD selinux-amavis-9999.ebuild 281 BLAKE2B 22395ca61e614a11514954b4d0465d61db35bf5e866630d70e8b59b57b756d970e213ee908301abf0bace55b28da073a4d5a2da3d5fd9db642c8d727d800b380 SHA512 27727ee6fd18fbb3345bca7927ef31c92a7d816cf7fcca80a96f9f678b51e37b2adee5efa057b821d51c5ea98314bed7ebe72e2e776fbb6f16c44b338589de74
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20190609-r1.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20190609-r1.ebuild
deleted file mode 100644
index 6630bc37efb3..000000000000
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="amavis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amavis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-android/Manifest b/sec-policy/selinux-android/Manifest
index dfc19f1bf947..fc73e73c861a 100644
--- a/sec-policy/selinux-android/Manifest
+++ b/sec-policy/selinux-android/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-android-2.20190609-r1.ebuild 430 BLAKE2B 39a1aab1387201c32d9892ab93ff2d887e3afaf85420e66014879e824fc05d53b2f37257c31137a3d358a4de560b35db616d22c991d574dce4abed48579ada74 SHA512 3106f5a1a336e2dc1e455e5f6c0456678bb3ac398072f0f118684db3a87958bd56736309866b2d3e7ebd8f752dc9923990249b1568d816477a6932632cbddbe5
 EBUILD selinux-android-2.20200818-r2.ebuild 430 BLAKE2B c04643209e2ae91a0cccd5a355c3b81620803424d8ff25ecc64132a5a45463d772919f2c83cbf3174704a1ed50b2e86e9cf68ea0093050d8ea5e8fcf6353c671 SHA512 09c3d1bd151db3ee1751d5c1f66aca1a026f855d71749c2e3566511a4c1db881a709c69cc7e53a02fbea38ad93e2ea17c6fcde7e42ac474580fdecd419a175e4
 EBUILD selinux-android-9999.ebuild 432 BLAKE2B e1b099932bc1d71eef4c677ba6af8436605e75c67a799dfb25aeb34f6e77566a2fee4feb282787b66743900a16d772dffe7ffbd3bb3b5359a528d2f01ec47ecd SHA512 a32133a02bcbb16dc6ae42f929f76575b8bedfc00ac744e8aa97ad2b8f85c5f8a603d94a4b84c34a2f17081851b4fda61cee92dd6f635ce422f1a9772ad11f59
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-android/selinux-android-2.20190609-r1.ebuild b/sec-policy/selinux-android/selinux-android-2.20190609-r1.ebuild
deleted file mode 100644
index 031c3d821d9c..000000000000
--- a/sec-policy/selinux-android/selinux-android-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="android"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for android"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-java
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-java
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-apache/Manifest b/sec-policy/selinux-apache/Manifest
index 4cbd28bfcf6f..947bfd4978e5 100644
--- a/sec-policy/selinux-apache/Manifest
+++ b/sec-policy/selinux-apache/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-apache-2.20190609-r1.ebuild 379 BLAKE2B 36558ca470930505a64bcfa6c6235bf17d6cf438f359ca5ddd4a08722348dcb27850f124d25192a6038c06c4944b1de14994a744119bc07ed30318f0b7ab0cca SHA512 eb33fac406e22f4c5849b6c87562d8f6e30ad45c3a33c7f878f5df229510912d388dfa79342182764660fb4b7b3acf911c04887330a6cad4f0c97431db16d97f
 EBUILD selinux-apache-2.20200818-r2.ebuild 379 BLAKE2B c9f778b694267fcb8afb58887c85fd6a7f0bab23b8cb1736b21012ee4d8b8fb960305b5b0856523c2f853e86523e6ecdaa4117065f3838639df8a6a882b5608f SHA512 55ec492705bd99a54d0bf100422e406d077a06f894877f83e7767880fe146cb6346c5d5d94f77aef64cc307e820523303996be5c69cb118820523af61dcbc7b4
 EBUILD selinux-apache-9999.ebuild 381 BLAKE2B b1f40c075a62fcf2b6eb92a77e2c8d749d6f75b3a91d2fcadc9b57d01c6ccfb3fecd23118eb6bd6ca190afda35e66d9c32c8c15cdffd260101ead19b8accc4a9 SHA512 943b54e0d61676c7651d8ec078370350e0542d1cf08231961ee80cd6d98798cb27820317085c16173b925facca4e52f77f90c88126a0a03ade35583fa0770130
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20190609-r1.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20190609-r1.ebuild
deleted file mode 100644
index a181b10df320..000000000000
--- a/sec-policy/selinux-apache/selinux-apache-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apache"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apache"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-kerberos
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-kerberos
-"
diff --git a/sec-policy/selinux-apcupsd/Manifest b/sec-policy/selinux-apcupsd/Manifest
index edbfdee15aa0..6395622038f7 100644
--- a/sec-policy/selinux-apcupsd/Manifest
+++ b/sec-policy/selinux-apcupsd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-apcupsd-2.20190609-r1.ebuild 377 BLAKE2B bb5075b0fc2e5aded13dcb5b9dd1c514acf49e6213fd66ef184290daad54bc1100c9dfba4674c55b09338bed71a4e4d3c515ee5916fc09e224812fa5ff5fdb0e SHA512 2d7ce7bef91f9fe9db6a623127ac003e84de5c530dede9df7b70805fcde2e20f25be0d11be0fbf1ce180e6f0443d56b6dbda38f322099cdfcaf090916d751194
 EBUILD selinux-apcupsd-2.20200818-r2.ebuild 377 BLAKE2B 68673f24583f685febe0813d91642f2de7a6a1582279fce451f3bc1b6ee64457990883dffab8d39ac68b35851e83ca05c451f3824d0240ddca9633a41ec4487c SHA512 9c3986c8afa01b8f01c23502121347820954bc9a1eae56004022fa9bc886b64e4372a66a02d57ec64492d149cc2fb257a0bd43dc9f2bd1a52896b64a97f4b0cb
 EBUILD selinux-apcupsd-9999.ebuild 379 BLAKE2B 8bb56c2c58d4d96b6a1a632825c4478f37f670e3a0c9cfb62cd923b2e2ebfc1338c7b5fd7569d836661f0c6af92c698eabe0c32ff66f5d22a42caa393716686f SHA512 bea6eb0da3d989975fe20a9c597f2adc0baeb32cda837b0e4fc09f0c8e4291c3ce16cebd473a1c1bbb0bab7e939abb37acdf9cefe756f6f893a7177a7f55becd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20190609-r1.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20190609-r1.ebuild
deleted file mode 100644
index 70059826e9b7..000000000000
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apcupsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apcupsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-apm/Manifest b/sec-policy/selinux-apm/Manifest
index a44d539c8d0e..1cd4b83a5208 100644
--- a/sec-policy/selinux-apm/Manifest
+++ b/sec-policy/selinux-apm/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-apm-2.20190609-r1.ebuild 808 BLAKE2B c4f9ba1fc2f34b80cb11dc45f21239016573322eac5df244686a4e5ea6d015bdeab1946e31ff99ee16dd615fbf3db8ca6ac387b8d3e2f8c73e7c10cccff2e4ed SHA512 01209694444ee9adea602122901a37e90b93ada6c40e254a8e68de45ab12c410baca2eacbcbf84c8effa3329897aff765624b2df59807882042d96625168756a
 EBUILD selinux-apm-2.20200818-r2.ebuild 808 BLAKE2B cbfe1c2fd10351378b1b47d1aa0e6d8cd448114c057458cad7e50095d898196a00caf759ca8747eb14b5b1c89febb30265e2585cc05b60ae6bd5ce9c5d337db9 SHA512 2a939b633f11a84a803a1783b8f03e142474ff91bc588ca46f8cc42f1865f1f11f14ed771312962812e299ee17f4e9b7edc78ee8086d43cd30e9d9077f75cf31
 EBUILD selinux-apm-9999.ebuild 810 BLAKE2B 00591e2f451478142765ffb7400dc3ae015fa223dd6db5b6d7377e143fc1c4ba4850d55460ca5d581fd8eb9fa54b282062db5055500ad8ffd551494b106a2eef SHA512 04c3288366f1c924b620c4e57117d906aebfce299484d9e94e30b1bd034a4523eef27c80961bf14bc6a261fac64fdaa2599f67e14b5faf3edb17b9dc756365f8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20190609-r1.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20190609-r1.ebuild
deleted file mode 100644
index ae55fff8b58d..000000000000
--- a/sec-policy/selinux-apm/selinux-apm-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="acpi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for acpi"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-pkg_postinst() {
-	# "apm" module got renamed to "acpi", must remove apm first
-	# the contexts are okay even tho the modules are not
-	# replaced in the same command (doesnt become unlabeled_t)
-	for i in ${POLICY_TYPES}; do
-		if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
-			semodule -s "${i}" -r apm
-		fi
-	done
-	selinux-policy-2_pkg_postinst
-}
-
-pkg_postrm() {
-	for i in ${POLICY_TYPES}; do
-		if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
-			semodule -s "${i}" -r apm
-		fi
-	done
-	selinux-policy-2_pkg_postrm
-}
diff --git a/sec-policy/selinux-arpwatch/Manifest b/sec-policy/selinux-arpwatch/Manifest
index 6f827f28011e..684a18cd2f12 100644
--- a/sec-policy/selinux-arpwatch/Manifest
+++ b/sec-policy/selinux-arpwatch/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-arpwatch-2.20190609-r1.ebuild 283 BLAKE2B 9d19ad02c822a4d6e5d85cb2023731f782765325731d0afa634878b807aa57b5dfeefe2181502c30b5ae71e79a1cf5214acfb8f444a2024ac240c54630a9f93b SHA512 6b2af7001ee854372e4cdd4896067141568584b7649caca6094e79a65967465c6cb231c80b5c3dfe415f900613a18aeeac4d82cceea9490451f2c7878c7822ec
 EBUILD selinux-arpwatch-2.20200818-r2.ebuild 283 BLAKE2B a288be50ebd324afe768fd297b9629d73583296f6dbf0de65328e8a23f5a31838cfb9e4129141c007e7655d7a85784942ab5d5d220a6ff7797e9ed450e91bb88 SHA512 ee2f05c48c74643b2f1b6967f2f8c4e7ab0a792befeed98208f40c1e7258c7fb255773c9c311d748495dc4d1c8f00d94120f855eb71778c03ff3ffc70ce6df80
 EBUILD selinux-arpwatch-9999.ebuild 285 BLAKE2B aaac5ec5f69cd33c00484e93b52f43a191cb641ed66f7e02897fc8a8185e7c11ffc07dce09cd3d20e9230cdad1cccffd1ad95e086fdc4aaa4b5fd8cbb9b55071 SHA512 2d7ebaf6fb3bc7c90ca19188454d07ee61b0124ad361606e5b4dd11542f8dc70e00746af60b2a1c048cd35d2305472f3892053c3bb073008bc317fb73d80ba76
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20190609-r1.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20190609-r1.ebuild
deleted file mode 100644
index 9bb3a3a5c47d..000000000000
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="arpwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for arpwatch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-asterisk/Manifest b/sec-policy/selinux-asterisk/Manifest
index d72ce66f580b..242b34f4aeb7 100644
--- a/sec-policy/selinux-asterisk/Manifest
+++ b/sec-policy/selinux-asterisk/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-asterisk-2.20190609-r1.ebuild 283 BLAKE2B 93b625c04e045d6b0e5abb4936ec00dcc712ecfa744cf08c98b4212a0d0076a1af05525d7aea7c98da6f51372e5f8475f92b91b45a6e9e9ff6da8b9b5acac819 SHA512 b4b7915b3b0061b73c0a7873502a9ba7157473073a4efe98e74314f17fe28d5a623a31ecafa2bac7affdf0ea178518e5583f93bb62a743c2ce065e42f810fd16
 EBUILD selinux-asterisk-2.20200818-r2.ebuild 283 BLAKE2B 1f2cf709407b8285455dfe11ad16b9a8dee6c56568e85ef81e34ed90b17ea4a8822d94ce62079e0852f4f21ce78c9af0c30b3287c2d600e973c1f3206c7316bd SHA512 6704ac87620d1a49fe287c73e9ed8c53f8a4ac6e0e8ba33028343c6b6d7b51e8dadd17a54541580bc8c50014957b221bf4e42facd9346106ddfc81c56cf8b423
 EBUILD selinux-asterisk-9999.ebuild 285 BLAKE2B 226f209fd69a2ef47636a3d7b434ad8960e1cafc91c85b86007ceb8cefb77dba48924cbba0212c4ebb0e8d03314c61398e93ea230e6d246d2ccd69287ce650c5 SHA512 f32e0a30c6046939a2292ea5d49f17cdc31d937c0f17aff73c53cacfb6e99dcf75106a2dcf9c8e1e620c1b1f18d9d9ff246e05efc7588f489b9605e55a67b3cd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20190609-r1.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20190609-r1.ebuild
deleted file mode 100644
index cf9c32649ff8..000000000000
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="asterisk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for asterisk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-at/Manifest b/sec-policy/selinux-at/Manifest
index 6f376f6c7389..002e6dea81b6 100644
--- a/sec-policy/selinux-at/Manifest
+++ b/sec-policy/selinux-at/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-at-2.20190609-r1.ebuild 271 BLAKE2B f3661f959b87fa726519c25fdc8c65e34d731256d31f73d7b623dacdee32a8ff5a17f781d63ed185d8ae9a152ec7edad2cd4ac00dc6d53e19af08f34e711a5b5 SHA512 1cf3770b458decb3117d041cc3515cc247d904523e6800c39bd978226129e2de43505e467c310338c5c053d2d781ef7a06ae843887d1d4d3c23b0fb6d5253fbf
 EBUILD selinux-at-2.20200818-r2.ebuild 271 BLAKE2B cf16080c3891d92e386146b19975da418885b5ba6b5e7f2afae95aeb09d0cd14b5fb8731e9d03e6d980f70f9bb5430b19b5e308a86cf7467bec032e0d1b8c2b1 SHA512 e90e1a6f8b1f426e416ab8df722cdbec42e2de1d6960d4bc8ecf15f2c533f7263d1bd400f8f7de1e3029d2d7c2423474f65ddc9e1485a8b8a204f3ffd2090dc5
 EBUILD selinux-at-9999.ebuild 273 BLAKE2B 875c97c5823d88f2c8499e7abfbdbb91df694d9efb82349721cf9d184c63c584108eb0c36fbe21fa0988b7d19743b21d420b00fa60772bb3a55ef45222dc62c6 SHA512 d6815744dc4f38e2bc32b456ce6c2319b828ccc2e32ea48c0e09e02822ce18934bee422b39a705b87c368083387ca2f431653e9e72cf61bf81ccf1dda34d6be9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-at/selinux-at-2.20190609-r1.ebuild b/sec-policy/selinux-at/selinux-at-2.20190609-r1.ebuild
deleted file mode 100644
index c049f8c29d02..000000000000
--- a/sec-policy/selinux-at/selinux-at-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="at"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for at"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-automount/Manifest b/sec-policy/selinux-automount/Manifest
index 7fe43f2b9c46..8632c040d5f1 100644
--- a/sec-policy/selinux-automount/Manifest
+++ b/sec-policy/selinux-automount/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-automount-2.20190609-r1.ebuild 285 BLAKE2B 3d1c9921d4bedd2489f52b85588ed5d8767eec537c194c1cff37e4b2ae6e601024108d6871f6f844a2920cc15626f76532c67ac4a8122f876cc3db4ea3efc1cf SHA512 2c3e5576601740933d185f51c4fb12e06666412ef86c1f9b453b4e9d62bce18e193b1b851214b2cdf949d558bfdc60b89c098268140758b4ad68456c3d447021
 EBUILD selinux-automount-2.20200818-r2.ebuild 285 BLAKE2B 38815054c843a7022636ab33752d2f246e818f4c05f96f33ffe4fa4002bd1c5786294295c0f08fa82e3b12b5eac3fac9c74f865610ce36272116e009c673de3a SHA512 75c82e3eb48abc3ace7a3b73c95a8713c6e3bd9eb980ce3314e7aa487db3b633c6414745cec478cce63dd885aecbd73599b8c77c65b4dcc7debd57a402c27f9e
 EBUILD selinux-automount-9999.ebuild 287 BLAKE2B 9ccd6ec738f97fd66c8a81e0ea10ec86b96644b3cc189371f65b12e9c999bf43f1888ec505649c73ccf819233006aee8e1d56a6e767f6666aa87ce92d42a2dad SHA512 f50413591613a691a69b3f6ae644f736885baee72466985281c62533039f59bc2aa44efec32035b5f748fa502cee373ff7e9c00dfdeda9ca9a63882b4d39e32c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20190609-r1.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20190609-r1.ebuild
deleted file mode 100644
index d7aaf7012db4..000000000000
--- a/sec-policy/selinux-automount/selinux-automount-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="automount"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for automount"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-avahi/Manifest b/sec-policy/selinux-avahi/Manifest
index 8031e7ba1fba..a74a2aa86a69 100644
--- a/sec-policy/selinux-avahi/Manifest
+++ b/sec-policy/selinux-avahi/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-avahi-2.20190609-r1.ebuild 277 BLAKE2B d48491fb1fd3ada5a956c422de2f2ee96356c771da92dc7ff1b2c3b26b5761a6bea25b558c5dc6714a265f17fd5551429421480cd7bb38ecb19a08d931ef5380 SHA512 2c36ce70351544e3ec3b411d165240004425a1d1415607208091558fbb5ec0a9ab3e9292f5c6d173c7c33059a29b14433f3d1f6ffcddab7a2ff178068f1a5fa8
 EBUILD selinux-avahi-2.20200818-r2.ebuild 277 BLAKE2B 9f72d37eabac0a5fec451dfbadeb81a51454e2d61afbc5783378eccbd79d1ff9f6d866d34e79220bfd451301395d9244b99003dbe73423d8fa4a2ee27ae37c94 SHA512 a3812a4b01f800254bb609e8cc0aebe4e38a88cf1cf161a906d71713cd3a3e6b230f7b3b55f168f0bf01b28ef2793dca51371ad9b5ac0623a516b4a093b02ac5
 EBUILD selinux-avahi-9999.ebuild 279 BLAKE2B 9bb8d85cdb5baa325e0ad95d840fcd7d3643de64e3e9fab70dfe6c9fbfc6c36b74e72a818cddea73f4c62098b187039ab3bab28daabae87c7eed1b924fb026bd SHA512 c05291fc289f1737abcca32b4437947c689a7440b68b34ca9a64aab6c6b0133241166fda950bbf0327c762d06631ea1279f3c559fc295c28fcb49e41a540d0f6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20190609-r1.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20190609-r1.ebuild
deleted file mode 100644
index 603ed81d8360..000000000000
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="avahi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for avahi"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-awstats/Manifest b/sec-policy/selinux-awstats/Manifest
index a932d15f0a31..90ffdf721b47 100644
--- a/sec-policy/selinux-awstats/Manifest
+++ b/sec-policy/selinux-awstats/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-awstats-2.20190609-r1.ebuild 377 BLAKE2B 3d4a5f5d6e48db884a4d596405b1abfd01faea79004468d33999d896a63d89ef375b10abd7f5e0620f87120e5c158667c1f0e819cc53fb90b6b95dc2f19aad7b SHA512 126be7bf7977438ad5f73bba0863eb20eff1196efe80ced56c0ecd80c6da9bfd65fcc23425d17a6dba2d87b126b15853440cd0a608c099557bb90a5b6a8f5a36
 EBUILD selinux-awstats-2.20200818-r2.ebuild 377 BLAKE2B 75da0e49dded471a7ae60a85a0d9f02745cbbde72f85cfd1ef60013d7415f522cdceb3c53ecbbf37f148d0986d5d266219dda1950e827c790a0285049c2acbe1 SHA512 211f7619085777329aca12c6723cb4731c814acd5f8a39f9bfe4de294d7ab32265c50f08dccc58026bfb8968306d4e93f49fb76d3296e87ad088dd5a998ac7c1
 EBUILD selinux-awstats-9999.ebuild 379 BLAKE2B 1429f6cf4b44107c83a8e4f2d15976cdd56562dde1565e00e22dcc21997e55f77a041e3284c646d13b52f443bb18cbc1a52a9e0fa8fa002fba39b89a1de8d9e0 SHA512 8e05a9209b04f7b6b3d84aa55c8fff978bb73828919d1b7e0a4f6170eaa77977f0738b2122d1eeb04afe435ad801e089ad86c042e5ac49ddcea54dca8a5324b1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20190609-r1.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20190609-r1.ebuild
deleted file mode 100644
index 04f221885692..000000000000
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="awstats"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for awstats"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-backup/Manifest b/sec-policy/selinux-backup/Manifest
index 2df76434d019..4dc1ef778d4f 100644
--- a/sec-policy/selinux-backup/Manifest
+++ b/sec-policy/selinux-backup/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-backup-2.20190609-r1.ebuild 292 BLAKE2B 42e280b68026e2adc49ca0a8636a001c5255cdd7be6528ae03985a58a1ae5263ded8949ac004170b12ea4ba427bbc3f67aca8b8e246227ba604337e4de355c33 SHA512 a11da8d59f5b21bb7aa276dae15aaf8c36788ab08a2829755ed81b861f789f42098390ab8314829f8ef6ce6ab64ba82734d3c310a6396ed672f2fec6bbda4552
 EBUILD selinux-backup-2.20200818-r2.ebuild 292 BLAKE2B f4f2f6de75e9d5aca90c9ea268389cebbefd2fdb39d5e1ed458ecb298f0a42ca606661a4b1933c3e999be557d15cd1e101728cb81de5878a1f039b30d1d294ee SHA512 07e8360897fbba80d66081f384d30b2ab3897f7626ba118faa06f9bf7e21d62c9ede69ca2dfe1fb74a3060a049f7cf7d39d275cb14533cf39c5769d325c2edac
 EBUILD selinux-backup-9999.ebuild 294 BLAKE2B f0a0927469c938140f5feed6ffb551585a7a74668dc1b27ef2274fc8de1657b9a3a36484d9f81ef7c34b9ce574ae77e3f964e0f0ac2fd96861d26014536df89b SHA512 9fbf3452b61e662cf20a79915333eb79920471c5de356335f75a4a933435d3647c0bbcd032783b5f010bfe50f9403719fce3b214be6044a32cbe216102abfff4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20190609-r1.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20190609-r1.ebuild
deleted file mode 100644
index 296374891d75..000000000000
--- a/sec-policy/selinux-backup/selinux-backup-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="backup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for generic backup apps"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bacula/Manifest b/sec-policy/selinux-bacula/Manifest
index 423256b5b407..d5fc173f5626 100644
--- a/sec-policy/selinux-bacula/Manifest
+++ b/sec-policy/selinux-bacula/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-bacula-2.20190609-r1.ebuild 279 BLAKE2B ccf7096c37cd959aed23da04f857a165f4aac8ce0c7c680ce026fac8c099d74f6572c586caebcdb7453d62f7ea036e0ce136596133f85f287650a6c15fb33d55 SHA512 fcdb5421f3500eb3bdd46ceef56b0745e104e09e7c5306d12828f3cbb2a218fcbb315c7acab6a7703326f37c3b2b43018bbd8902fb488bac360ea4c79f7ed0b2
 EBUILD selinux-bacula-2.20200818-r2.ebuild 279 BLAKE2B 9621e9d2dd16db339ed439d4a32a30bf780db06b824ad53687589452b34c541331bcb3a4ca8c44f361a6aeb3d848a3ea83b3be9546c86ae29231c41927c796b0 SHA512 82087747307b270b60fb5e2a03aa8f8acadd60157296bbd5495c0db9ba7e0d01cb483718182b1454b4ab5822e22fa1448bace218a91be1c4526c7d56279c4c1f
 EBUILD selinux-bacula-9999.ebuild 281 BLAKE2B 6152370488d966d0beda01604f3cabdb058cb93c677529faded7ae9e7a545566b02599cb8b7f6bd8bf127df68a8b015f28d82adf3d812786e208a190cc18f9b7 SHA512 1c9269692abe12ff3b03a91ccb1273bec81f24cb98873d36c7f5566eab6333e212b5017387d1b7a4720e2210d8e0c97e093dbc6c23bd4ac02cec7683c220378f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20190609-r1.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20190609-r1.ebuild
deleted file mode 100644
index a5a4b9617c7a..000000000000
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bacula"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bacula"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 0161ce36673a..af434579157b 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-base-policy-2.20190609-r1.ebuild 3816 BLAKE2B a52fb08dc3d36042f251afe98c7894b955c3160890eb4eb84f0b69428a90b05d764b7b1ef12315cea44d5b00617b5747303872e906f67e68c28945cf48197d48 SHA512 cf062f6526826c9b7225ef3c8fe0a3b74da3905b35ba0a174328de422cfc383fbb6831dcbded65f876a956d66523bab39c89f5e23c7a5f80eebc5067ce72a550
 EBUILD selinux-base-policy-2.20200818-r2.ebuild 3853 BLAKE2B 2f2ea84e89392c4804f9b58091bbf507defbcd0c9b4fbfbfd90ef5e3210e623d7223477bb3321ed0f489ca555e2ace214db8d265d4f64b0d6140046bc2b85b2f SHA512 f97a595e9fce3c3d0e70502abcb62d602b0b67f91fe4400231aa9cf08edaad463203abe1a6505d1ca442d42232dac68520dfccd0f29a8b5f474c5977e251f99d
-EBUILD selinux-base-policy-9999.ebuild 3855 BLAKE2B a73f84895229a688ae90c06f08f281ddb0ca8d947024468ad485a7ee3f75dd58f4547a80f9c02f5bbd78442a33bfa5bf192aa94e20b0829db5675fa4bffbb7df SHA512 dbe686f2132878b7e85255f9ee8c296ca625b8d77be0ddc5018be4ef49c2240ebedbf789157c96a3c74f94afb24cf0304353c23dc3480c0d4e64793f39ddcc56
+EBUILD selinux-base-policy-9999.ebuild 3847 BLAKE2B a3044fed56f1a9195d07d6282fdd8b9506c29d6246575d24967c5066b939c656de30a7b5fb1bb508ce3b595859d2de2d0fa459c0032db987e46ca9411b4d73f4 SHA512 735b1a96d2e51fa79210d0ab738a16b1deba3082483efc91b5630bd09c6aed204bd87d43e04d0a8a00b04001d86321645d754afdb780041a8504687e5bb87658
 MISC metadata.xml 534 BLAKE2B 1bb289204431150ae974c9fd677926faf72e75def3294b9df405a048e398ac3b6147de8483512487edaeea378e1dbd32df0675acb7fa50326c48382603c5dbfe SHA512 d8340bec9d0ec0feb396b17b53a6d53e3caa7ddd1efdc5e5de07baf86592ad0526d08fc08908295cf18a915eef1c7429c72970d56967162b2390eed6f28c822a
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20190609-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20190609-r1.ebuild
deleted file mode 100644
index 3bfca9781cb9..000000000000
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
-	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
-
-	inherit git-r3
-else
-	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
-			https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
-DESCRIPTION="SELinux policy for core modules"
-
-IUSE="systemd +unconfined"
-
-PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
-DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
-RDEPEND="$DEPEND"
-
-MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg"
-LICENSE="GPL-2"
-SLOT="0"
-S="${WORKDIR}/"
-
-# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
-# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
-# added) needs to remain then.
-
-pkg_pretend() {
-	for i in ${POLICY_TYPES}; do
-		if [[ "${i}" == "targeted" ]] && ! use unconfined; then
-			die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory."
-		fi
-	done
-}
-
-src_prepare() {
-	local modfiles
-
-	if [[ ${PV} != 9999* ]]; then
-		einfo "Applying SELinux policy updates ... "
-		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
-	fi
-
-	eapply_user
-
-	# Collect only those files needed for this particular module
-	for i in ${MODS}; do
-		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
-		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
-	done
-
-	for i in ${POLICY_TYPES}; do
-		mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
-		cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
-			|| die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
-
-		cp ${modfiles} "${S}"/${i} \
-			|| die "Failed to copy the module files to ${S}/${i}"
-	done
-}
-
-src_compile() {
-	for i in ${POLICY_TYPES}; do
-		emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i}
-	done
-}
-
-src_install() {
-	local BASEDIR="/usr/share/selinux"
-
-	for i in ${POLICY_TYPES}; do
-		for j in ${MODS}; do
-			einfo "Installing ${i} ${j} policy package"
-			insinto ${BASEDIR}/${i}
-			doins "${S}"/${i}/${j}.pp
-		done
-	done
-}
-
-pkg_postinst() {
-	# Set root path and don't load policy into the kernel when cross compiling
-	local root_opts=""
-	if [[ "${ROOT%/}" != "" ]]; then
-		root_opts="-p ${ROOT%/} -n"
-	fi
-
-	# Override the command from the eclass, we need to load in base as well here
-	local COMMAND="-i base.pp"
-	if has_version "<sys-apps/policycoreutils-2.5"; then
-		COMMAND="-b base.pp"
-	fi
-
-	for i in ${MODS}; do
-		COMMAND="${COMMAND} -i ${i}.pp"
-	done
-
-	for i in ${POLICY_TYPES}; do
-		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
-
-		cd "${ROOT%/}/usr/share/selinux/${i}"
-
-		semodule ${root_opts} -s ${i} ${COMMAND}
-	done
-
-	# Don't relabel when cross compiling
-	if [[ "${ROOT%/}" == "" ]]; then
-		# Relabel depending packages
-		local PKGSET="";
-		if [[ -x /usr/bin/qdepends ]] ; then
-			PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
-		elif [[ -x /usr/bin/equery ]] ; then
-			PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
-		fi
-		if [[ -n "${PKGSET}" ]] ; then
-			rlpkg ${PKGSET};
-		fi
-	fi
-}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index 5de9dfd5ff41..171244e9e45e 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.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"
@@ -27,7 +27,7 @@ BDEPEND="
 	sys-apps/checkpolicy
 	sys-devel/m4"
 
-MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg"
+MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg"
 LICENSE="GPL-2"
 SLOT="0"
 S="${WORKDIR}/"
diff --git a/sec-policy/selinux-base/Manifest b/sec-policy/selinux-base/Manifest
index ddf021c0bd1f..4d00a5c2868a 100644
--- a/sec-policy/selinux-base/Manifest
+++ b/sec-policy/selinux-base/Manifest
@@ -1,10 +1,7 @@
 AUX config 631 BLAKE2B 7c7c5ad7e2349cf8dd6877bba7947f256b6bdee492ef76a44ac378eafb9203c0d7ad6f188a762c61b80672a56dca65767567cd68c998aa67d58a9579e5c0cae6 SHA512 f3c4fece54e5786de94fc97c8e7678f9901c6963828d28b020c423458ac258480191f216522fed7658e7ad1c94fd25557efc524a4b75ec8837116c6a14c2328a
 AUX selinux.conf 119 BLAKE2B c877aec601cfc066b42493a3b45e179834d30b7f0eb34b625f3758795c2fd2e58744cf539fdb5b06c002365fb264bdf6e953c1f6e30c7b2d310e22206ea5a37f SHA512 a057f84388b2b494b5e7623b076450c1856687c50a4ccb5aa22215748461786a0c71fdd9f76e9ed8639bcd3040006fb010aa5497192d6c0cab432a1b9c028b3b
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-base-2.20190609-r1.ebuild 4148 BLAKE2B 4612b1f194d7635b8bf29c60f177ae4bec921b6ba5648d4d7ec0bdd322f3179cd4037d56d4f75857f80bfc9ae2f2362ab5b15ea300d015cc73c30834eb505bf9 SHA512 7c23345cb1dfb2b4206f05e5ce443fcd3ffba033ce14f9c176262b9f2a771cfab6a2c5bbb22a88809b650017f21fb6b858bd9709220320df0d2adf25c0a1a673
 EBUILD selinux-base-2.20200818-r2.ebuild 4082 BLAKE2B f6eab54aec21a2a93ee8b2301ab57e1fb5daa90c2169a5e3231adf63fdde0cfaf1ce1c046b74c019c75d4d23eab7f3df4aab65012a0b77b1fb0cb0049886c47e SHA512 ef6ab4e99691a71a3a63b64bfea2002b72b67101cc3e018d311c0cc5979ea2f47d5fe6182e0b99ea9a75330652244b2441d0d0e0492614fe2f0bc6c37823ee9f
 EBUILD selinux-base-9999.ebuild 4084 BLAKE2B e2529612cf08b38594ea10fdbe0cdb25f9189aeee6d56c3372a64d5a9de8f3662fc16640d285e64e646f9f8dcd730c6e86161a8da7a72658f209e09346b34991 SHA512 20d5668e233332f6e96a2e5d7bbb0a63cb0bdf943e253cdbc06fc17d4a2aa149d2abecf36efbd0e847386b7bfa669adca7d5d33dbe67d2fe36c7c584d755cbca
 MISC metadata.xml 744 BLAKE2B 8589c81049afca5563829e8be7c262429474ffa5e4d448cdd5404b16899734ba06189c073f876075250df7d0231d424ecbd142e85aaad71a4df016035625a0e2 SHA512 9367603b98ebd5aff6e1377ba9d537dd2ae532da28daf9f16479c60f35a6ec7e34089ec1966c4c88b364440693662b111ee32f2f74baaf218006b480b3951eed
diff --git a/sec-policy/selinux-base/selinux-base-2.20190609-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20190609-r1.ebuild
deleted file mode 100644
index c11baced5560..000000000000
--- a/sec-policy/selinux-base/selinux-base-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
-	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
-
-	inherit git-r3
-else
-	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
-			https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
-
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-IUSE="doc +unknown-perms systemd +ubac +unconfined"
-
-DESCRIPTION="Gentoo base policy for SELinux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND=">=sys-apps/policycoreutils-2.8"
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	>=sys-apps/checkpolicy-2.8"
-
-S=${WORKDIR}/
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		einfo "Applying SELinux policy updates ... "
-		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
-	fi
-
-	eapply_user
-
-	cd "${S}/refpolicy" || die
-	emake bare
-}
-
-src_configure() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	# Update the SELinux refpolicy capabilities based on the users' USE flags.
-
-	if use unknown-perms; then
-		sed -i -e '/^UNK_PERMS/s/deny/allow/' "${S}/refpolicy/build.conf" \
-			|| die "Failed to allow Unknown Permissions Handling"
-		sed -i -e '/^UNK_PERMS/s/deny/allow/' "${S}/refpolicy/Makefile" \
-			|| die "Failed to allow Unknown Permissions Handling"
-	fi
-
-	if ! use ubac; then
-		sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
-			|| die "Failed to disable User Based Access Control"
-	fi
-
-	if use systemd; then
-		sed -i -e '/^SYSTEMD/s/n/y/' "${S}/refpolicy/build.conf" \
-			|| die "Failed to enable SystemD"
-	fi
-
-	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" || die
-
-	# Prepare initial configuration
-	cd "${S}/refpolicy" || die
-	emake conf
-
-	# Setup the policies based on the types delivered by the end user.
-	# These types can be "targeted", "strict", "mcs" and "mls".
-	for i in ${POLICY_TYPES}; do
-		cp -a "${S}/refpolicy" "${S}/${i}" || die
-		cd "${S}/${i}" || die
-
-		#cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
-		sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" || die
-
-		sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
-			"${S}/${i}/build.conf" || die "build.conf setup failed."
-
-		if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
-		then
-			# MCS/MLS require additional settings
-			sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
-				|| die "failed to set type to mls"
-		fi
-
-		if [ "${i}" == "targeted" ]; then
-			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
-			"${S}/${i}/config/appconfig-standard/seusers" \
-			|| die "targeted seusers setup failed."
-		fi
-
-		if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then
-			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
-			"${S}/${i}/config/appconfig-${i}/seusers" \
-			|| die "policy seusers setup failed."
-		fi
-	done
-}
-
-src_compile() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	for i in ${POLICY_TYPES}; do
-		cd "${S}/${i}" || die
-		emake base
-		if use doc; then
-			emake html
-		fi
-	done
-}
-
-src_install() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	for i in ${POLICY_TYPES}; do
-		cd "${S}/${i}" || die
-
-		emake DESTDIR="${D}" install
-		emake DESTDIR="${D}" install-headers
-
-		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
-
-		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types" || die
-
-		# libsemanage won't make this on its own
-		keepdir "/etc/selinux/${i}/policy"
-
-		if use doc; then
-			docinto ${i}/html
-			dodoc -r doc/html/*;
-		fi
-
-		insinto /usr/share/selinux/devel;
-		doins doc/policy.xml;
-
-	done
-
-	docinto /
-	dodoc doc/Makefile.example doc/example.{te,fc,if}
-
-	doman man/man8/*.8;
-
-	insinto /etc/selinux
-	doins "${FILESDIR}/config"
-
-	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/selinux.conf"
-}
diff --git a/sec-policy/selinux-bind/Manifest b/sec-policy/selinux-bind/Manifest
index 87525df04232..7c8a6a795f28 100644
--- a/sec-policy/selinux-bind/Manifest
+++ b/sec-policy/selinux-bind/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-bind-2.20190609-r1.ebuild 275 BLAKE2B a1d2e9d70e3118b2967086bd85035977cc4435fd172721313f104a4bc62b02512deb68bc3d746b78203264a733299904afb69be08f0a0f90cd1496eece7e7310 SHA512 21d9acda1af4769eaea00bc7c7947a20218b6f4183777cff937176ad607a1179519b0f23fad2b14572fc75dcdcebba07020ef1d5b1578216b05d9e016d9875da
 EBUILD selinux-bind-2.20200818-r2.ebuild 275 BLAKE2B be853a4b7388fc62e1fbb3548367deeb187f401e7ca19034b6cb9826ea2ac2750de1a4adaa27417b91e77b3bda6c0be27dd941b7b5d08d547d3e75edecc986c3 SHA512 cb722fbfda05bc0785b2a176931ea94577e7ae4a5a0926cf0eaef4fbd116b1f06c9717f1c8933e3d1aad4f674271d0b3be323eadde373ff3b0b7137fc2dc6fea
 EBUILD selinux-bind-9999.ebuild 277 BLAKE2B 9445c535f94a563e097ccdb32d017e3dbe413868d94debf11c9c8d16ea862e6528f2896cf21ae8cc9ee0862c8817488bd70ecd3d037bdac03f1e2a28110d124c SHA512 df526b178db329ccf4d0edae1f121986671fd332bdb29a52541ffeb7e8ab73e4a0dc515eedc5b39e5ab33fd66d25ad936deb64e08ef00c7e23fde093bc2a1365
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20190609-r1.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20190609-r1.ebuild
deleted file mode 100644
index 316b5a0c1ce2..000000000000
--- a/sec-policy/selinux-bind/selinux-bind-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bind"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bind"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bitcoin/Manifest b/sec-policy/selinux-bitcoin/Manifest
index e0bafdc4f9fe..6b2ae2ae3bcd 100644
--- a/sec-policy/selinux-bitcoin/Manifest
+++ b/sec-policy/selinux-bitcoin/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-bitcoin-2.20190609-r1.ebuild 281 BLAKE2B 1610f1382644bda0a76c7f8fe8f2e3acdfdcc55c127b63a25acad490af2ab85a066445d57b0c249e001e5564fedbea8123ade422a3073018e4f41bad33739acf SHA512 96bdf2cfa511de8be12854e567dd9fd0380b1b259630f0c73ed6f43e5944e6cae645ccf3a2a62910415d185b7e4eb8e968583e563d0713284a2ace954c1a8675
 EBUILD selinux-bitcoin-2.20200818-r2.ebuild 281 BLAKE2B e79b487b794e163ebd17225c8e4bb2919cb830d18cee55de822288e82fb5df07b95b411c34ee703907eff3aa69c01bad97fbb2346ad41993ed71be7ff04e6322 SHA512 c6440a06cf2b7778308df8486cfcdf037516aae24311d95779b99559e515373e99e73a4191cc6ef1a3ceddc28a8a1c4109a2af2ecfbf77a46c45f8f24bb8f706
 EBUILD selinux-bitcoin-9999.ebuild 283 BLAKE2B a26cee0e61b67ebdd2d39e05ffad4b8527df2c19453065be7dbb243a3a090f38da3c757b2125d5ae91b2e5f941ef158f31a2a1487c1571692b262d2849684e7c SHA512 90a9c01235003cf7df65b576067c634452b73c9c12307044ac9ff9d6bff66ca242eaaa19f4cf2e9bc76f43161d8f1c503f8b2baf5bfe67efc6f526bb26a74db7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20190609-r1.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20190609-r1.ebuild
deleted file mode 100644
index 975370171f42..000000000000
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bitcoin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bitcoin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bitlbee/Manifest b/sec-policy/selinux-bitlbee/Manifest
index eea1ea5c5449..ef826a6f0eb8 100644
--- a/sec-policy/selinux-bitlbee/Manifest
+++ b/sec-policy/selinux-bitlbee/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-bitlbee-2.20190609-r1.ebuild 376 BLAKE2B 8c59951e90900de40c14efecc42ddd49702e5034b82d90f2f88cc8f7af331c93c688062d169910f90bcd2dc9d9a04efc3508ebdcb02e7efcd0079a1bfd3f1d41 SHA512 2600abbdbd16bdfa016cea289c51f6ae856cc9290d74543555fbff9b970fe0d205d24c7b81774f24cedc308827e7d7f6351906295b3c441bee1f6ac6f7e1d5de
 EBUILD selinux-bitlbee-2.20200818-r2.ebuild 376 BLAKE2B 7581dfd903a2a031358c2abc9e237593f521801a90f5d006040d5188f88929b0606624244951a5082c4cbc26b5608f773b7cc52e88920b109101a973ccc1e0b0 SHA512 cf790e2aa01c66cf3c4255c2861142585c0622fe779cc4f7239b700c14d21f5ece63b7e18823850b06fc2ecfa94693e2d2f4e0e6d84ccc260c73498613ef615d
 EBUILD selinux-bitlbee-9999.ebuild 378 BLAKE2B 853ade1796d2b42ab79bf17fea059d6b76f9845c0e323e5efc44da3ee582edad3fa1e7ffc8234e520f3a25be498ca073780ed06f235f8b9bbd838b7670220280 SHA512 8d9632380dfdd744007f0b33fdb8fab0add94e23b44734cc4fbae4025166eacc822ea95e3ac9ae6a16af4002c5d21c014d058a79dd91aad76738064ca7dd00ed
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20190609-r1.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20190609-r1.ebuild
deleted file mode 100644
index 0216388f2893..000000000000
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bitlbee"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bitlbee"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-bluetooth/Manifest b/sec-policy/selinux-bluetooth/Manifest
index 679fc26529a2..8cab90fd6973 100644
--- a/sec-policy/selinux-bluetooth/Manifest
+++ b/sec-policy/selinux-bluetooth/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-bluetooth-2.20190609-r1.ebuild 285 BLAKE2B d12bab4cebff0abd177ceb9bb9221f6f53bee86fa1c98ef51457b8531c56d9cd0328557eddca61d9209e7e4749c827ee9aab6a03e257a5ce4d2cec0336bb1bec SHA512 7c3ada0b09c470fe52c0f295b7cf91c3ab23d4a02936c70bfa45d60119abbe6167ce467866bbc5ce291c7980acb8e80f47049c8d3e9585ed00d8ebc88633efd9
 EBUILD selinux-bluetooth-2.20200818-r2.ebuild 285 BLAKE2B c87e4c089abd27605b627a59340dac486a315edd39cfc47c6a7192fec3c93ed3d8fb393099a49ef472dee5cd37070c8e33f4cf60900e96374f92864cbfa326f5 SHA512 1a7c34b457b87be0d396cf562514b764b34804f88a9bf935e1c76e8edc34af28a332ac4566741754225fa7d9e4615a4d2bda7b9b0c489c1a26a48ff0c87e4bfc
 EBUILD selinux-bluetooth-9999.ebuild 287 BLAKE2B 75dbb035f8f1217c5bdf03a8e154936fced89a06624a031dc8c662d01fea188e7e8ab95a5d6b5eed15d99fe18f01c7a5113ea74114bc538726d4da0384614773 SHA512 5a004dbbc84ad33e4bd73c32a12234c35fcc4ce329af6d306420cd8332ff391ad3c7e533bb2ce53b8210eaed296b4997a6f7d8cd70d770adcf28091389f26fb1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20190609-r1.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20190609-r1.ebuild
deleted file mode 100644
index 29c4304ad9f4..000000000000
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bluetooth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bluetooth"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-brctl/Manifest b/sec-policy/selinux-brctl/Manifest
index 9ee6cd835ec0..939838649776 100644
--- a/sec-policy/selinux-brctl/Manifest
+++ b/sec-policy/selinux-brctl/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-brctl-2.20190609-r1.ebuild 277 BLAKE2B 9f5e14caade3681e3b0ffb8984d05f3dd59cff90ab1af66ae9f4a73ccf63833cbcccddc671864d22ea9e14f003ec300ad1654b3199aecb14760453e477d79b09 SHA512 94b230780355b21d7842fd486709011e6ce9e19b552f6d462e23c09aac51fe44db0609bee4046d46bb2bf2c5c8b0c7583dbb0dc47bdcb96bdbfb2515babb3e52
 EBUILD selinux-brctl-2.20200818-r2.ebuild 277 BLAKE2B e4b86ecc5f464fa1bef12fc78595a6cb78e2adbf0e12d3727726ea18a8469ac2e282912659d61128228cf416ac978d381522c5e788243bc7e7d715f69b1340a4 SHA512 d4f1d665181d569339bfa48dd5be62452b8c92602936ef8f43fd99cdf968ae5b8e50f7ef086f0268a62bda478c0dba3d16b1d09d3eb42a2b0c5278c8bc904042
 EBUILD selinux-brctl-9999.ebuild 279 BLAKE2B 47e4466396b13d5c41d375256c0b6cd347f8eb3802218758a7b29a7a5279ff7b8a6e6244dbf6ded0e5bd9f64307bd20f387371303af91407e7a68e06941c2655 SHA512 a51d46bcff1067a68488b7781ffb8f46040a78bd98b0571bbd9780151aad3a8a467bbacee610eb8ca2f8ce6fa8f2c1477e0d871a04708967828f9b0c7ec0613d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20190609-r1.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20190609-r1.ebuild
deleted file mode 100644
index 9e7406bdc317..000000000000
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="brctl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for brctl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cachefilesd/Manifest b/sec-policy/selinux-cachefilesd/Manifest
index 655085da5885..4ef99a4becc8 100644
--- a/sec-policy/selinux-cachefilesd/Manifest
+++ b/sec-policy/selinux-cachefilesd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-cachefilesd-2.20190609-r1.ebuild 289 BLAKE2B 62621fd6a3ee25a2aacb47976964a1e2f23daf17c5419293b90591cf163c8b0bd5f55ca3b9c60b84dd2163ecddf1c9dd804d8b67e03a489d1ffd0cd6cf2d4961 SHA512 800d39ea338e8bff886be89b14ab48e2dd664295ef4c71779d67b04b512845fa851ff7c1e321abac6f002b8e371476b63c3e89cac8618a173623a61f945e2cc0
 EBUILD selinux-cachefilesd-2.20200818-r2.ebuild 289 BLAKE2B e9ee84069f400e3c78ee09d51034f255a37ec1d32a61c09d218ee971afc6760ed010342e9ed05e01723dc0d50b400323db404e303fdb36644528addddf6658cb SHA512 a04c33ceff046d0b13d58299c1615e0479cadcf2f0f6f07fb728c14d08abbdf01de631ac5f789502cfec6d7bd3310ea6f35189307aa11171d5e8dc571042d5df
 EBUILD selinux-cachefilesd-9999.ebuild 291 BLAKE2B ff5708a9b1b96d5ddd4a68f3ff82f74d1c6ccdd9f91e84cc7835e342bbeb9eecf00ec7125002e6ff0ee62143effda857a5ff2ec9d655c992c5b537637e85579b SHA512 dfa8843bcbdd1502b2633a070f8a45a0db4a2e3d52033bec0910809b3f8f8cea9943f635cb27fb8f00de1875dcefa01edd2df8deb3548008e1a89a3e445581ef
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20190609-r1.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20190609-r1.ebuild
deleted file mode 100644
index 8de1241a8c0f..000000000000
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cachefilesd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cachefilesd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-calamaris/Manifest b/sec-policy/selinux-calamaris/Manifest
index abd1641899a2..764e379e4492 100644
--- a/sec-policy/selinux-calamaris/Manifest
+++ b/sec-policy/selinux-calamaris/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-calamaris-2.20190609-r1.ebuild 285 BLAKE2B 5e6c54b0d6145ec011631a4ffda705b9c474bd0a366e76a0b3d5e27edffab213520dab273d8b4f2470c68fa8fba6f08202ed1f8751058fafc6ed8a50b76cdab0 SHA512 97270bc3bba2dcb4601f79480a91933b633ee0b66cec0f710a3c50f8468c7a464e7413b9718c43b8673f26363f524a4b9c74131972182ab8d7b25e0343c63070
 EBUILD selinux-calamaris-2.20200818-r2.ebuild 285 BLAKE2B db492d396413670b71704faa140099f55902ad204c4f5ade9ce8b589d4e87c2134338cd1f043b70b63917336cc3cc77db3ed7b420c5b82d8e6d9859d62ce104f SHA512 3d1409e5854656c71b8c550142517665c99e8802c77af6bddbadfd76e4f23dd802a3231888a0207aa34d9719e2a2fb149b4f8286dde28ae6a7d8ccc2344ee201
 EBUILD selinux-calamaris-9999.ebuild 287 BLAKE2B b19c283d62ec662fb737225ac4822bd4913138514747610cc4a93be51a61a028223477685510b484c419c33885158a795fe7a3aeb3ea16f54ff4a3b36a9a566b SHA512 fd44e10c183d284f6f461f0ed2892e8094a5371bb30582376853f280efea0420179f4669d0117061d41b7730f853fc2406ef2c5dcc2e8327876bed531e3b3668
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20190609-r1.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20190609-r1.ebuild
deleted file mode 100644
index b32bc6a90c1a..000000000000
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="calamaris"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for calamaris"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-canna/Manifest b/sec-policy/selinux-canna/Manifest
index 5e65a9c36791..0c34cee9356b 100644
--- a/sec-policy/selinux-canna/Manifest
+++ b/sec-policy/selinux-canna/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-canna-2.20190609-r1.ebuild 277 BLAKE2B ba4a0f5feca81ff65396644d0768a2a1570f82d4b5efe266b730ac55b3638576cfe82578795a523731f624f844d99a8e474e1760aee8a63854fda6a240d88db7 SHA512 f6d5540280fae2b93df3ca211b4e540adadaea14e9ba100c6e35cd67bc8e1d85cfbc0e18ec60c84bf1f550740a2db514c8a0183185f26133ce3b51e53c09704b
 EBUILD selinux-canna-2.20200818-r2.ebuild 277 BLAKE2B 0047b94d9a6f864af1b369bc89f65f231a3082c2c9271510f84036f403669f589aa82a83ad6943e32841537f8b411d3467b47902b1fb89ceb3043685d35b5e9c SHA512 3ecac05039e83fdf95dee58f266d86749fcfded69b2e8abecd48477140f66d65e10a95b4498b09e79751718c9ca339ca5529f0f9fcd15fd0ed7feae7c363c6f2
 EBUILD selinux-canna-9999.ebuild 279 BLAKE2B c0edd018de1cf7554e6b9d3718fb2770559fa1208525f661d9de4a8a7b2a1301e900d80dc10b238a6d813b4528fe039d99f4aa4ca5d5b076d3081c84d717b10b SHA512 29a69d5b7daae0d35c2271cdfedf402b7d2da5731689acf57db031ba17f7c7ff1f5e571bb15cf7ded6a45c520d468791b2fc2c378e7a50f9fafb0456d2ae47c6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20190609-r1.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20190609-r1.ebuild
deleted file mode 100644
index 52fa0b1fa258..000000000000
--- a/sec-policy/selinux-canna/selinux-canna-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="canna"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for canna"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ccs/Manifest b/sec-policy/selinux-ccs/Manifest
index c5a30358340c..e0dd3b3eba1e 100644
--- a/sec-policy/selinux-ccs/Manifest
+++ b/sec-policy/selinux-ccs/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-ccs-2.20190609-r1.ebuild 273 BLAKE2B a55c9ad8324741067e4b2574fd61d13cbb19aa9ba61e4fff3791ffb4270d681c71db8e752a309249569d8d19db60d733c2574202f1b6d42eafce628c86c3182c SHA512 4d39feb8672c23987c3c4d1a0f3c27a08b3f20d2b4832d7ff6abd4fc54acbd6cfd9b9e105bb4d87b62037db6ab418d5a3cb0c29502988f7efdaba1bc340f1185
 EBUILD selinux-ccs-2.20200818-r2.ebuild 273 BLAKE2B 81227ffc0a19b82ce1dd3a7674e9d116da38d9fd643ca67e56631d06b425288ea8752fe32ecc47fae84a4e956a7d7c44b97487c9e5aaf04ced29c50d8bf53a3f SHA512 4d22b19ab31ee6035f5959f406ec720ed82328d4b5ee43b9cd2b4d3ff4f15f0c20247742d75f9f925f5d388ab4e0b82fb3c28ac44ec01dd5423278effafd2371
 EBUILD selinux-ccs-9999.ebuild 275 BLAKE2B 40716b2856bf5983421d3f1738f8b78a2e854f435336e2a2b1121b0b99c003df28779374a01db603156ada085207a896ec4372f27efec653b7ebf6d0184071f5 SHA512 5c612374ca4d51ce3a4486c2b17878331bd76d733dd7e568cfa77697e8f6d806f374af72a3c8289b0eee4efd4a49d67c47a800a3d80fa9ef77d9d1e197f70374
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20190609-r1.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20190609-r1.ebuild
deleted file mode 100644
index bbfa217c0599..000000000000
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ccs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ccs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cdrecord/Manifest b/sec-policy/selinux-cdrecord/Manifest
index 66d2292b05a6..8fa97a092876 100644
--- a/sec-policy/selinux-cdrecord/Manifest
+++ b/sec-policy/selinux-cdrecord/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-cdrecord-2.20190609-r1.ebuild 283 BLAKE2B f9d7718a8b590cf95afe074e784779306c5c7e0852179cefee1bc62e541cba8a6f1bf5402b94fbd80af949008bee1f8a61aa33978d43b61399255945e3a76acf SHA512 a285156aa3cabf03e7fa33b37cc0ac2b6bfe41c5b08fae0be9d9e0dc1b7cb1866539ade936fd2123743a32f9f8c1178ed53da842a5f40594ece7ec91fd40bdbc
 EBUILD selinux-cdrecord-2.20200818-r2.ebuild 283 BLAKE2B 78231e44fe1e0b731959f9e646a3828374afa6a3a7531bcf828afb0cb01f9d2b9277b68c4883f574a157b0dbaae8e852e181d9024912c8fbc59ac7ced5dc7568 SHA512 f14faf5efa3836c89787571cab9523d9a504a4c1de1f66ae366f6f125b70ac06bfacd4e20191fe1a3622f10410afeaa3cb0d959e0509149c63e2c43ebf6dba05
 EBUILD selinux-cdrecord-9999.ebuild 285 BLAKE2B 65f7cb5ba866f088949afacf41b9474ff04b86b84055074d1eef78725b5e530ec69d0ad2cff118612a55a1d1095e2628894d9333570732de1a800cd5f216f153 SHA512 53f9b2827ea4e5f2719265f033029b857e28b6c30ce1661337f50e980afc025e6196fe0f6e74c9af492a3f28616cabef7781070a4657d8a4086993bf2820b5f9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20190609-r1.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20190609-r1.ebuild
deleted file mode 100644
index 9b1d26dd820d..000000000000
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cdrecord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cdrecord"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ceph/Manifest b/sec-policy/selinux-ceph/Manifest
index b9f3066ed125..4940054e27a9 100644
--- a/sec-policy/selinux-ceph/Manifest
+++ b/sec-policy/selinux-ceph/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-ceph-2.20190609-r1.ebuild 275 BLAKE2B 3f1cf2e8ecf307e7d7b34c75e685b7c780b1f2f6d71a399bd5d916576c10865709606de0c1320d462be1a32297b0257aab2b89532c3dc405d5770001721cf489 SHA512 991350d9f335fec7f97ea971bac7355686be9ecb46a3a3342faf4195f994cc3d700f20f2a45dd2bbde7ba5fa3d17c96d6e8ee10f40e145b9d435e4fcbe71d961
 EBUILD selinux-ceph-2.20200818-r2.ebuild 275 BLAKE2B 9905ec5272d2bdb860c03c54dbd538089d053aaa6a97e78b1a8e99b7d383445afc0bf64d74cc2df41f305ac17c528625b81254905c9eed505543104aad55d5c5 SHA512 759043b042a889523c728436614263b4d87cc7bd33fb960873c5fc65213d24a8ce8852d6712c979519b0714bddcf48012fd9d16bfcaedea4d6f43c6f1bcf65a1
 EBUILD selinux-ceph-9999.ebuild 277 BLAKE2B e465276852ca438eb198cd579fd0da78e0071c8f268bf8b86608151714de326d43fe6167ce24f78bec23569d86ef9b876266a67411cbf6ed8bd3aef2dbb17908 SHA512 adbb04c92564f463673d9b0425149729734855139a6db47580b322e4a823b8ea0d713949b967aa91b3628b674570be48f8cf3fbab1f99d0683b6d304c54141ab
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20190609-r1.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20190609-r1.ebuild
deleted file mode 100644
index 5661fc772eff..000000000000
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ceph"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ceph"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cgmanager/Manifest b/sec-policy/selinux-cgmanager/Manifest
index ac021c93862e..4019bf478197 100644
--- a/sec-policy/selinux-cgmanager/Manifest
+++ b/sec-policy/selinux-cgmanager/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-cgmanager-2.20190609-r1.ebuild 285 BLAKE2B a691290b4e6548fc1fee3d57d82e15b6295e1e9e14217f4d4828e4dec9d5b71ea883391d4323ea0a315e46baede6334046aab997efa1b896adfe74e4ca281db3 SHA512 b76a762d06b121ba557cfabb5eba4de052705e145671e64abc231918a33e9f054709e0e1912e6c4967f905f48858580877356d0ccc4136ba3a8b8c290722dc18
 EBUILD selinux-cgmanager-2.20200818-r2.ebuild 285 BLAKE2B 7f7cdd7b431f34d9d2565a14b8ae242ae5f8e6f4bb5a09acb7e617d9cee52f4e78d641870f9c586c44d98eb61893fe8ab9d2ff8474f9ef41861ced120b549e35 SHA512 860b13ce9d1abe284f12063a33ea3ea1a0bdb6a27438099e3dbfb673b1ed2cec1826eaac7b80c41c5e2b97fda43222c167e4355d6635075b4db0f3d6c3c47720
 EBUILD selinux-cgmanager-9999.ebuild 287 BLAKE2B 649cf3c4648d52bec6725b4175a91016ac6749fab436f7c72f780f2d679c993891724f34b665a7b24c7744267a8a25dc0c5e6c66c0151844214be894000e3bbe SHA512 0569a483abc07df2251f4466bceae35dd5f002a2a157f9a7ba08c835b5b03380e235d51e600240c07bad2606788365dcc45d5676d97a175e143cc9803564a602
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20190609-r1.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20190609-r1.ebuild
deleted file mode 100644
index 256856515232..000000000000
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cgmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cgmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cgroup/Manifest b/sec-policy/selinux-cgroup/Manifest
index a4d49bffc996..a8a771f18c6b 100644
--- a/sec-policy/selinux-cgroup/Manifest
+++ b/sec-policy/selinux-cgroup/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-cgroup-2.20190609-r1.ebuild 279 BLAKE2B 847883a8a9d4b4ba7ca3430fe1c38783e530bc93e8dcb1f14ad7825023455636b517658713855e402e631b8f7714e591b6b37ceab845a06cd5bb41e1947b32f4 SHA512 778b0ac980766fca9b34436636ed0089a9219bbeb075ea36829d769e816e30c84922c0896ab8e39ee756d10ed2a371b7fa405106ea8fc7d763a892d873b8b9c9
 EBUILD selinux-cgroup-2.20200818-r2.ebuild 279 BLAKE2B 5fbbbb1704d9e67dc020ddf3b6ea0259f90e61c1becced331d95518c2d1449da1ffa4bd0194237ea4756d33a89117282b4cfdad131908ca9420f062dd10a8693 SHA512 f0352eab7daba63c38e2b8d6780be513d1a6d852b90696b4b967955ad1e90e0c4e69f992f62f5d4092506d3111453b3d53283355d7485b25d13e751f029922a3
 EBUILD selinux-cgroup-9999.ebuild 281 BLAKE2B e3f1c496f04fb1a809227ae6e91c4cf7816626bf953f04f34d24fb3d7616b35b7d7b1c5c40e61f04e1e7e220a5c95df909eea49f5051ee9cd43f774c9b1f17e4 SHA512 4d22e492730eff7872a069f1fba1d4f873d2287ae4362986da0373f16734c5edf5ff727484b117a1dde190c33742fc13db3b9ff534780b2a34df47a4707320f6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20190609-r1.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20190609-r1.ebuild
deleted file mode 100644
index 8f2a15a1e49d..000000000000
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cgroup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cgroup"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-chromium/Manifest b/sec-policy/selinux-chromium/Manifest
index f788f39a374a..b44464c8eeb1 100644
--- a/sec-policy/selinux-chromium/Manifest
+++ b/sec-policy/selinux-chromium/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-chromium-2.20190609-r1.ebuild 386 BLAKE2B b3957f297ac5d60e3e083db26ece2855399cfdb8cc6fad5dd5f31657cd586c847ff94638b64dc7c517ed70005611ceab6a3995c12f0ab4c2c34c5f6a588a09e4 SHA512 95b9cda33b49a59ee3c6239ace9d7780452297aa4d2a23f8f64f9de91866b17f0f4dd146ab7531521625e39be4d079138812e64fa038087d0cf3b4da682289fd
 EBUILD selinux-chromium-2.20200818-r2.ebuild 386 BLAKE2B a8e7ebc68fd74e6ac98d7fee9c5427d024437e5020591ba2780c3f891b6ce66d73e805a6b4e1527498ca54e53112eb9422ecb168275dcf1f0fe48641cd032a72 SHA512 4575d3982d25f6194b1dded3614659a191dee705c3ea1f4cb6ad858a3a1ea8b36b6abea9bc47c8399200c3d154ca4753b8261422219d5d5d2db9624f2c674f19
 EBUILD selinux-chromium-9999.ebuild 388 BLAKE2B a0095f40c421e3b77809829c2b23982db9789ccfb69f7ef83030bf7aa5e2eb90c1056de6e8c756c66772286002da50ec66a3684c68a96036b20fd2e69f0d4b53 SHA512 339361cf715e84d05658886d89acce26fa1b93dfabe417f29ff8a5b5df77789114ee097b9f25c27296022894475e5ca9300926f2f8256d252fb19a23900bc48d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20190609-r1.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20190609-r1.ebuild
deleted file mode 100644
index d6caff85c30c..000000000000
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="chromium"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for chromium"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-chronyd/Manifest b/sec-policy/selinux-chronyd/Manifest
index 012fe16086f5..0e3a2533e467 100644
--- a/sec-policy/selinux-chronyd/Manifest
+++ b/sec-policy/selinux-chronyd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-chronyd-2.20190609-r1.ebuild 281 BLAKE2B 8ef09c64df1676cac54fc381ce8624e777dc80f247a174c0b6937a015a0e80ae47b5107bf5046490536a334e890fbf72a4ac302066db9dd5c018ff44afd8c1f8 SHA512 506f03977777021a02c46d62132ab52e7b8b8ff145f335600b7300f4c87b851b1e267023bbb0af3d4862405561116a48131caa3d856eca4c85862a6ddd16ef25
 EBUILD selinux-chronyd-2.20200818-r2.ebuild 281 BLAKE2B 5e7dfdfa8fd62ef4e0895daaf32bfd5050c1f7f8beef4cd8bee67d9e11cad3d9d58cae4855520c677bc0d80b96ed34d6cbfc161a40d92430c8d0fb64c80423c8 SHA512 882f33afe0902a66b50b1273b6d23fe5915d972636eff7c7a10528f5ca57ddc98cf81941fcd2ba954d5c1df229e5b5056a7cb9b3e2fabe25941e3d4cccc175c4
 EBUILD selinux-chronyd-9999.ebuild 283 BLAKE2B 4cdceabd7b44b7dbcd36b325e97ea292e71e1e34c29616e9ef53049ac7014813165cb45f6463782ced7d2aa3e1d8f8a4363571aa0b2908873c84821e5f801a44 SHA512 07330fe4994990b51f0b54b0c0a25adee58a826facb9a39268618379007d5db4cff76cb52fe54c1b3904c40ec4f14d1ed18eb97c833b619529a9b24c2aa9874c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20190609-r1.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20190609-r1.ebuild
deleted file mode 100644
index fdea543bc6a6..000000000000
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="chronyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for chronyd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-clamav/Manifest b/sec-policy/selinux-clamav/Manifest
index 60f00d6e3294..2de8a0f07306 100644
--- a/sec-policy/selinux-clamav/Manifest
+++ b/sec-policy/selinux-clamav/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-clamav-2.20190609-r1.ebuild 279 BLAKE2B 8d64ee8ebabdc8f9c0550c5690bf7682b767f333d4fe31afdf0dce72c5731913edd93cc58d9afecbf1cac4f0cd2c6fb80b11adba49d342f9ee3d17d92fd44902 SHA512 0496b2c936ead928811be52e336ae54310b55e0f695f02294da9fe1c0a9f3ba66f474ad14275ed35794fb43c67aadaee6a214e1df2e9a22f16286b1d81cb1c6f
 EBUILD selinux-clamav-2.20200818-r2.ebuild 279 BLAKE2B 93a6904f9caabc2b156e1bc07a73d9786914817855a52f8a781da3c8b1585a1b67adeab6bc0ff9a8be12eb11d540b5e53e4aca0035113b2d82cd81d16d0329e9 SHA512 b45e2a118953277e2bddc2d5fd12b129e340b9e318c015a5ca4aff09ca406e0e142b04b3f07fbb4222f79a648163014395fc05b07e7d67db98fdb6777bf4cbb2
 EBUILD selinux-clamav-9999.ebuild 281 BLAKE2B a7029834b43a8d6e3ebddfbe4f959cb2134a51deb3c1af8da39d0e7e065b912a0deb3fef2019c9db636131f615e7581a8104ba0bf23669e101de94910ea3cf80 SHA512 b292e5f6e6bafee380cd48d1e707b787c333248838b27511b08a058217724d9c10f8b47534b769ad970901aac21140b681acaabf9c507ba91d46b4e5cfab312c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20190609-r1.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20190609-r1.ebuild
deleted file mode 100644
index ca2993f85ce7..000000000000
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="clamav"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for clamav"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-clockspeed/Manifest b/sec-policy/selinux-clockspeed/Manifest
index d7894493d243..668f4a985a8e 100644
--- a/sec-policy/selinux-clockspeed/Manifest
+++ b/sec-policy/selinux-clockspeed/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-clockspeed-2.20190609-r1.ebuild 287 BLAKE2B eabcb38709b528c5100be262fcdaab88e27d9f9e6a65564fdf47bb10c286cb7d25b462d5e2c6684483e64fe39a1a58acf13198374678f501bf92c2c83626d202 SHA512 7bae6f665b0fccba1b7a9ca4498634c33373b07e2dd919f34372d4b5ff2fbf75e81f069d8c2ade91732f5b4a559e6c094716a8f9621d8d2b86e44a0a9f9f2a7d
 EBUILD selinux-clockspeed-2.20200818-r2.ebuild 287 BLAKE2B 95979196fad8d03f868fc77fba10e6a19c42f1c7196c55c0482887444cf9c32a1e5c236e983d7204ded7ae738f4c93a153a1ffbfd57a186da1c0883b42886e75 SHA512 23e374f60c4123bd58ad36f2573617b5482a983f52f91ed8f7235e893cc85a2ba5dc86bf73817bb85381f3ef0f54e94d604024414c438a8fbe16089dc26eda05
 EBUILD selinux-clockspeed-9999.ebuild 289 BLAKE2B c9a47354758121edb5e74495a546493465379c52c9123030627d9176117570d0f025c850adc08a3f784aeda4a319048e6064aea10a9f963314927d01fa9937e9 SHA512 3ae6a6f1bb08af4ff123c1f47f010301b64435820a3ddde9aae8341ca85af84ed78e6235318cff62c633eeb50a70135df5a9a64ea0cc040b0d7e90ae404ef1dd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20190609-r1.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20190609-r1.ebuild
deleted file mode 100644
index 3ecd87cd4b1d..000000000000
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="clockspeed"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for clockspeed"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-collectd/Manifest b/sec-policy/selinux-collectd/Manifest
index 366bd732ffcb..425470f0e51f 100644
--- a/sec-policy/selinux-collectd/Manifest
+++ b/sec-policy/selinux-collectd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-collectd-2.20190609-r1.ebuild 381 BLAKE2B 17a959cd1db858ee52adaf8020211354cd5c91145a07ff7c4bba7c333c7428a08b098ce1eaa98a5bbc66b33ab740dd76f9dbaed419b54199c696f4f31bd44c2b SHA512 32002c22388a3b6e79a2a39380f1270d73b3e91e47872b72bcb69cfc7ca8a9f2ce0e408b35c2b8446f2afb3c69dbc4821f22148ce778e2c708ebe4f742853cde
 EBUILD selinux-collectd-2.20200818-r2.ebuild 381 BLAKE2B 00a9c737194e1dfbd8f5e37da296e0c84ac96aad65b71bfe6eff7b9ef9d6252b6c7df141e873e5d9dda8c331f15b9a707747e782692ad07d887eed8d4293d32a SHA512 8bc799f08781661d03d4cb3e55472388860f0a8062ba77d0ad914b1aa580476dd8a67a425d40d93b6ea30bf22722e7249fd2dbe29c00993c3b446bf369094fae
 EBUILD selinux-collectd-9999.ebuild 383 BLAKE2B bf81c5e7184410d5b7dc8e376de4ef80c74e873481b9f1d5c255f37a24ebb94b76d8377623f6d38251f1eceb4c107f01b22ac2c26fb32a9f665744cdb2ca8aac SHA512 eef8aa0773fb031810b8133a4fcbbd6d4a3b0cffda563b1a31cc11fc9ce3fed1bae9ec4f71fb376aae3770e8e198ebc027f9e52d5259715e4976fdc3871bce87
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20190609-r1.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20190609-r1.ebuild
deleted file mode 100644
index 2eb2d32bcbb6..000000000000
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="collectd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for collectd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-colord/Manifest b/sec-policy/selinux-colord/Manifest
index 013aeec3cee1..2530fd3c364d 100644
--- a/sec-policy/selinux-colord/Manifest
+++ b/sec-policy/selinux-colord/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-colord-2.20190609-r1.ebuild 279 BLAKE2B 7533377ec675c3836471a1082a6cb8aa30612eba93f36bea096333d3f1f278f3709334a8e20ec3230a930adaa0484b843f4d18fe169d781acaf2608b6604f181 SHA512 337bb2a2c3cbf549c948bab5335046b550821614dd637cd3f7edb99b6efde16d4a1b4fdaa67e709108233695efc6fcea725b30095799ea9903ce3422a6bf23a6
 EBUILD selinux-colord-2.20200818-r2.ebuild 279 BLAKE2B 1bef57f05145832f9e01b57cc289713a38e2c6f6b5cf2941cc206395dd6a7d92bd688f975704294602be01cbfcc4d5b03f13d6d8b188b9063e5a5461ab6025d0 SHA512 8644851dd1d2e818ce71fae22517f623fc89a3ba73369b08f7a305d4b69a386579f03edb754298bc1ded53bb6c9225d567ebe001fbbbc57c1b4c2cfa78846cb3
 EBUILD selinux-colord-9999.ebuild 281 BLAKE2B 2bf92942362699080cc8031431650a844ddc595d6374388e9430ab1e54d9d2f8c7deec81ed5b6c8a5de7f64b05d53498cc6f3415b93241b730bc8ae44730ccf5 SHA512 030068cb88957b1accda47b266f516fadd0f48a6dc35ecec71d67907baafa8c5304057a5be849bab03b2d9f0c6f673cec7e214ed5351dde54b07852dedf512df
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-colord/selinux-colord-2.20190609-r1.ebuild b/sec-policy/selinux-colord/selinux-colord-2.20190609-r1.ebuild
deleted file mode 100644
index 5227c7770b88..000000000000
--- a/sec-policy/selinux-colord/selinux-colord-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="colord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for colord"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-corosync/Manifest b/sec-policy/selinux-corosync/Manifest
index f7bd977a926f..704dbe0aa034 100644
--- a/sec-policy/selinux-corosync/Manifest
+++ b/sec-policy/selinux-corosync/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-corosync-2.20190609-r1.ebuild 283 BLAKE2B 2198e3f80286408935d77bf920acb978cbec53833d094019bb1a7bc9b798730211ee1b877bed9d0a303d80ddafdc8969a892981ea1640367ef595408c7c28891 SHA512 52d07533b627a57f879c20b400190c3c7640b690050fa67f7e0522a03deb79453fcfc2d0146a741cd6bc48aadb981ce2353e3cf593e41fe2a235d40941f7fd49
 EBUILD selinux-corosync-2.20200818-r2.ebuild 283 BLAKE2B 006d42cf2a5d760e04d75a074124af106dd778d34f8cae5e2381da3dae4267eedd8dcb7566c56fe593f3b5eb28689d5ba2ee4a18b67c720939bdd7dd6c5c14fd SHA512 bcfdb9ff7e80d71528a39ac4a1acfdd8d7e3081d22edff4f7fbea960b38c1f8656f5fbc7c06d35c4e8378825965d0db3c1714888b5be55d91644258fdd982916
 EBUILD selinux-corosync-9999.ebuild 285 BLAKE2B ed892cb2e317e241d491714492ac9bc6155def0ca88e1ddb93b547e7b90b80fc06d88a5d91216ecd307ca58827b6dc090106ca6fa450a92f5772980e051aaded SHA512 b011076dedc8f5106f0cac8999e698cd68e2b69dfe2892690521c40932b219623dee2b2a3a2c061fe97f2c461a1bdb97d2b82039f36be26e718c0c68e2960126
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20190609-r1.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20190609-r1.ebuild
deleted file mode 100644
index bddc292c3cc9..000000000000
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="corosync"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for corosync"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-couchdb/Manifest b/sec-policy/selinux-couchdb/Manifest
index b81b0b7dd9f0..178b8790c80d 100644
--- a/sec-policy/selinux-couchdb/Manifest
+++ b/sec-policy/selinux-couchdb/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-couchdb-2.20190609-r1.ebuild 281 BLAKE2B d513c992867bc074159e5527a9283d624c33515c95e2a45941ae2141f6c0cedd24499dd656bbf5d8fd7af5c09d683d092ab8abc7a9834583200ba3ca28670c4a SHA512 3dcb4fe88cd1dc914e3825353dc86deefbfdcbd2910e539587c7facfc665f54395d98ac6a2432ad24bab092bff1044533da6608b78e85d59b708e9e5260037e8
 EBUILD selinux-couchdb-2.20200818-r2.ebuild 281 BLAKE2B dfdb882db42a455a5cb89fc9f5951328bf66f2f17ba9324d775fbc9f16df2532597cb54d994cdbdb170621936bc0acbc4b4ca0b5dce3003cb226a1f3d12439a2 SHA512 bfd204f33b2a12f16b561aa1b1446b25a05e240040388450c497198315c3a94f8b101b6d72bc1cdf6d121a0cc3e30a33d91b10abd223decd4c20a6e94e5466cf
 EBUILD selinux-couchdb-9999.ebuild 283 BLAKE2B 9ed40c6db3bd6a174dbcb3d8ef1e6b6972572e366556336119cfc353c33bdc6f6d904336cb6710854467401a19d61ca63635a55a0119534dc94b0795385c3c17 SHA512 c5ec6c2f70e89e65c67902cf1961a35f447e51957a396ce4bb402f1c7331651cb4520bbd8dc131f2e050cd628499e2c192521387b1ce3ce94331fb74d687317d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20190609-r1.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20190609-r1.ebuild
deleted file mode 100644
index a0c751186b13..000000000000
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="couchdb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for couchdb"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-courier/Manifest b/sec-policy/selinux-courier/Manifest
index 5c7937168f40..e0443d5de500 100644
--- a/sec-policy/selinux-courier/Manifest
+++ b/sec-policy/selinux-courier/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-courier-2.20190609-r1.ebuild 281 BLAKE2B e6e04cb26645e913102a74a20379a539c635ea04a589112a9bad7558b1cb31fe1fdca03874e06803357ef49757ec0ee430649313f5c18073e84c21d87d586788 SHA512 ddaf17f887197b7fc9ec29327bce47692ed76509f948cc139fa909025236f8623473bcb788fbfe1f49441917d4187354ba938580796ab55318c5109b7dd8d8ab
 EBUILD selinux-courier-2.20200818-r2.ebuild 281 BLAKE2B 1686068808885492f8cb337e1f0869ad28ff6fec977b794aa2e27a9f102cf4f9f3e87d003671e59d43048bb9265962dd6d9637f2957bb61b4eb20c0707e85dff SHA512 2654a3d6c20c3dc1847228865209fe44029d94ba187d333170cb1c32442042ecd35c1018169987eb48d40bbc5358bab95e0e4ee6a7dfa5f9bac9561032889774
 EBUILD selinux-courier-9999.ebuild 283 BLAKE2B cbfd0e460d66f711cc4c4cf1d5254fe9628014bb581b654f88e7611cd7dcc7b49b1d3a67679e8efad5b2f4aba5ec3767cc2029206af13937c5afd7a4be876c0f SHA512 d96822e50b97db25b3a3deccea24dcbe1833dc21fe6b7bebfab96dfa5d9cfcf8688c1946bd193b7e569eac239d7b56f1dd46f64570cd4e063fa9e7180c3654c1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20190609-r1.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20190609-r1.ebuild
deleted file mode 100644
index e386d720af7c..000000000000
--- a/sec-policy/selinux-courier/selinux-courier-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="courier"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for courier"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cpucontrol/Manifest b/sec-policy/selinux-cpucontrol/Manifest
index 5b6e89c52078..0c73a8743bf0 100644
--- a/sec-policy/selinux-cpucontrol/Manifest
+++ b/sec-policy/selinux-cpucontrol/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-cpucontrol-2.20190609-r1.ebuild 287 BLAKE2B 0a8439d581fd71bfadcb0796bf8b9f5cf77e8c0bd90cd2ac43d03d4c82916f27229d57c31b4acc6febd9873a8c2770515e3356441f7e485e5ad5873709f8d2f9 SHA512 c6be951c5208174d18a425e9fecd53e2cb0fccdf69cc88a395933e16e8fcb5bf0d80af7d55807856e140ac38641689e8ed7c47dae4f9779238df7ed29d635c9a
 EBUILD selinux-cpucontrol-2.20200818-r2.ebuild 287 BLAKE2B fe0a5f84c50242dd35aaa9ef8316e110323fbf2bdbff2f9a5168856ab31deeafb0f06055d93f2657d2ebd59d6a8fa4bf0cde233bc244c44167e2d35bd30636d3 SHA512 9b45a08a551668be2717ee1878c05e7b2b32c1e22361aed06ee1275ac460abfe9a0d8b662502acb2983044589c63a98a4861ece9e168225c9feae44b3976b1de
 EBUILD selinux-cpucontrol-9999.ebuild 289 BLAKE2B a5369450443129fbb1e163637e1012fecc8f96636fe278143797ab2482be3d3a58cffa9651d7822e5941be33412af1367dd8f878aefa8ce46b64b3b19fccfc60 SHA512 3dde3f0252e44e83ffc206cbcd1d6bed489b0ff37634b563e177582dd116073ed9a5bff68e260f0007b2a42a0b1e96f40c6cb986f5f2ee1a5a3badffbae91b49
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20190609-r1.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20190609-r1.ebuild
deleted file mode 100644
index e052c5e46053..000000000000
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cpucontrol"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpucontrol"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cpufreqselector/Manifest b/sec-policy/selinux-cpufreqselector/Manifest
index 3b96b0c08795..911aa8e4624a 100644
--- a/sec-policy/selinux-cpufreqselector/Manifest
+++ b/sec-policy/selinux-cpufreqselector/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-cpufreqselector-2.20190609-r1.ebuild 297 BLAKE2B be345972d93d700482d355cdee230c9ed9d1c1a41b14dcad74009a741d38cd036600889feb68701f87485aa2e8ef751efad82e8b0eb183f1046cde5efb2f2c8f SHA512 50ab8d4b3c8f2ee4eb2de411f1d514e7aaaef0497957da1b9e928d9925f29400d8ad2f79092efc6064a0b1b45ea5a1b7cf15e6fbd1dc8c901191178bbc7721d8
 EBUILD selinux-cpufreqselector-2.20200818-r2.ebuild 297 BLAKE2B adbed823b16bbe82d6d37c70a08e94eebe100d962c43feafea6cc20af19572ac9000ae91012a6531aa883376191136b558448e6eee97e3bce3d460a63eaaed71 SHA512 ef14f2ec10a112f485f9148b2ab92ee0e37805ed3a9ef43a152cc24f1d9bfd8ac285d138541510a8dc744e238d4c58d09a329c987f129d5b5162417651dfc634
 EBUILD selinux-cpufreqselector-9999.ebuild 299 BLAKE2B cf1e149e285aeb80d7beb21f592c30f4828275c720c60d4dcfd7c360cefc2fca9f20eef035610a0e1a539906663bac9b3742ead4623df6c8afde4cf662d807c4 SHA512 9cd369f287da50033d8b424046b53c89d4725aa4acc156c14ada8035347966a2d595037adcfb8b1ed899d02178f8cff326b5490b1c00acba35a4272770e47547
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20190609-r1.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20190609-r1.ebuild
deleted file mode 100644
index 4406aa586813..000000000000
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cpufreqselector"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpufreqselector"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cups/Manifest b/sec-policy/selinux-cups/Manifest
index bad24228a9e8..da4d78dbb998 100644
--- a/sec-policy/selinux-cups/Manifest
+++ b/sec-policy/selinux-cups/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-cups-2.20190609-r1.ebuild 365 BLAKE2B 4f29ef848b343bd3c6e68c8ecd4193ff17cd3614820431aedf25f48997a1604e2635ba94dc5bc58bf8c567ae4e478b294932ac20f314a0285ffcb7a102b87f0b SHA512 201adc81cb9346b8642da2fa3e5df8504d68fb4a42514ccd0f1537c43c4f8543cb9ac891aabd687e6e2e3bea47b8ad37feddb763228581397fa0e0aff6757471
 EBUILD selinux-cups-2.20200818-r2.ebuild 365 BLAKE2B a0b453cf2bcd2b963a839e4f4fa8926347efc12603d19192b50d18883cf47807dcedb214876e64a8fdff70bf962e6cab94a8a747d2bcc37c687e5d326973a313 SHA512 ec8f5ca272f6fde1a0819886e2c4411af851bc60183371209c750e0fc8cb397cf1c000b940ffd7f0d1228f0c6cace2337284ad3beeff12cbdda389604d636bdc
 EBUILD selinux-cups-9999.ebuild 367 BLAKE2B 5b06649b8e59b11f3e42f0eb1ca7ab62719e89b34381006898d0cc1765edcb7744c0931b8ce961ab378b041d21aa05e91380d67a804862cd826c60644540c01d SHA512 7d49edb167010339c717725bd4758c3a1a87f6a9dbe63e9b83204f40bb62e55e797df6852e26c8baacff2b5c79af407ce6b0aa03b4c2fec6d848cc02d6812161
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20190609-r1.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20190609-r1.ebuild
deleted file mode 100644
index 7df0fe175dde..000000000000
--- a/sec-policy/selinux-cups/selinux-cups-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cups"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cups"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-lpd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-lpd
-"
diff --git a/sec-policy/selinux-cvs/Manifest b/sec-policy/selinux-cvs/Manifest
index 96b8698f8d23..78306ac3e78a 100644
--- a/sec-policy/selinux-cvs/Manifest
+++ b/sec-policy/selinux-cvs/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-cvs-2.20190609-r1.ebuild 421 BLAKE2B 7b1d4e66a76a2f87b2215685199026603b2a4e78cba080e73684fb9cc5dc864ba90ea35510d97c316c9a8d2477ef58c748f4ada85dd5d7d323580185fd722226 SHA512 c8e1c4975eed2c29214bcc2a915b37d1acd06b258210d99784a0418d49770d9546453d978122ee55b03c783965dc15f4a75b861bcfc4f280c18c040998219b3a
 EBUILD selinux-cvs-2.20200818-r2.ebuild 421 BLAKE2B b76bfdc3aec9ac9612da2bda87c4d353784fd7767d04e8ca2f477ebb51faf51eeaaa3b7d4c2f8c57a77bb23ae9d54a98500b2dfec54cb67b10d8de3dfabd70ae SHA512 f26cea9a6e4fe926793d7057cd1a4caecb64ce0243d2c7f9570cc38336dc33db0e949df1594c10ae264bd5df860c7bbf4319172e8c74834e8a931b4ea94fc41c
 EBUILD selinux-cvs-9999.ebuild 423 BLAKE2B 468983328fa1a148f2243386a9128cc8f0acb230bba0c7637d97db07cc8d40f74c3dcb1b5a5dbd3b52043ff7722ec9126a13aee19d0c4fd146c9a347222a37c3 SHA512 7b9ed6a0545ff606cdd383f55f596d7e373dd11e3e170488102e5ad7b5cf1f374f14177431843c552b8e252fae4049a076d153e19aeb768a3d76f8fa10d851ba
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20190609-r1.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20190609-r1.ebuild
deleted file mode 100644
index 4eb8346ea7b6..000000000000
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cvs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cvs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-cyphesis/Manifest b/sec-policy/selinux-cyphesis/Manifest
index a0ad9d2180be..c1017a1d6548 100644
--- a/sec-policy/selinux-cyphesis/Manifest
+++ b/sec-policy/selinux-cyphesis/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-cyphesis-2.20190609-r1.ebuild 283 BLAKE2B 14ba4a4d0ece648f0a550a0941472fd4d2d9a29d1293b6b510f264a4113881242353920f5aa95555487650043e52cdc32ff31f42e4f41dc583c7fa1bcf927782 SHA512 92a586f376ab93f8f8ab0c6893eeafedcf6ccb5ef3609ca4bd5a63dadd143dd8315453cc19371c4e69edeb9e1daab2955231dc93ba353d1f9552426b5e5065c2
 EBUILD selinux-cyphesis-2.20200818-r2.ebuild 283 BLAKE2B 113ea5abe5f44d27382ca93067066dfbdcb4453b0ac12d0c83c4d7726aef4bb0b14f77f92b88ef57e4fee05467ef7119a3972e7316260ee3cabd716141a3649f SHA512 a7095e195de2eab48683c4b53170af1989f2d8938557f8df4ef70e332411e479bb9464ade216cb0e74e43c3217bd73050b6b90ed7541545d394469fd0b5e9f3f
 EBUILD selinux-cyphesis-9999.ebuild 285 BLAKE2B b163dcd35b595a2ede86277d9e8394bcac5dc45203d06636fb06f0e2dc831c6fdad7a9cfc18036a5a58f919ea01b480b61439858bf46e7b86a3662e792539f2e SHA512 8bb8132cf9b0eb7c211eef3c3d9f6d03ddbeade6294da2d4740a021b401864c2900415432f1f6579dfc54804f9121e59f76fd015b54ce59c230828519e1c5a99
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20190609-r1.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20190609-r1.ebuild
deleted file mode 100644
index aace0ba91fa1..000000000000
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cyphesis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cyphesis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-daemontools/Manifest b/sec-policy/selinux-daemontools/Manifest
index 71de58420535..7fe5b02ed438 100644
--- a/sec-policy/selinux-daemontools/Manifest
+++ b/sec-policy/selinux-daemontools/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-daemontools-2.20190609-r1.ebuild 289 BLAKE2B 78cce0f411f28593b77ab3ae118d9d2c36f831b872999addc9538e9bf0cec07905b23a8efd0eb5106d23cbb22db6173f8c2e67783d1e2d628e8c4892e2c664ce SHA512 09034e7453c7238104df33817bb83db38c7feed14a245ee01f28a11eac6ba746c3fe8ee48c862761e78d951c13ebd407b84d0f8dd4383263d1cd38f01dcf2b90
 EBUILD selinux-daemontools-2.20200818-r2.ebuild 289 BLAKE2B 0e0a4bd7a6a1f9ed5c253fb7dae4982a358507d3b6662a9d603dec1ec0f63eb9366e160df96efa9707a4cd312952468651c995e1066b18c6cc835112ab1f5999 SHA512 318f7f8818f644a4d2c914d8ba835a147e7d6320ebcab675695c919a65ebbcd27dc0bae5be3b0fac6eac1fc771f074b8ce5cd9174e7b5be0ed933bd7564d04a1
 EBUILD selinux-daemontools-9999.ebuild 291 BLAKE2B 77d3fafcecc1feb818596907209ce8fbadc2cf4dfc0df515c90bf7f50a64cff838015f1e6116b60ad3a585071b7147048a9fc6e2dbbeefb83595340c50a7c697 SHA512 3bd6cd6c606588f9236bc6b0ba65243612052848a9dc55b705371d0e0b2f798b7177aae293c92bf090ff7fa55f5d3a647bdfffeb07a0f19d1e9ee752c2dedbb4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20190609-r1.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20190609-r1.ebuild
deleted file mode 100644
index bb6c6bd46e73..000000000000
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="daemontools"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for daemontools"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dante/Manifest b/sec-policy/selinux-dante/Manifest
index 65b4faef3d44..dc4308dc75ae 100644
--- a/sec-policy/selinux-dante/Manifest
+++ b/sec-policy/selinux-dante/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-dante-2.20190609-r1.ebuild 277 BLAKE2B 71889654b43a1be75dc76719fdf465862e176d1c9a65c713cfa7f77fc30b15f59b278555ad4434cb108ee7dce58549a78f79da17d948ec176078a836f8294584 SHA512 b1a63f75afd135c8cffca782335e4bafa2f10260cc128370d6c6b5038cccc19f038ce4c3022bed3c5595a359f8915c378cfe4604378004f43f4251cf4b9a11ee
 EBUILD selinux-dante-2.20200818-r2.ebuild 277 BLAKE2B 2458369e135f79caa8bff48df99f14df53827e13114df950d9b4e9a5c256cf6e558655c0926fdefd5fa2bece07124ecbf3dee113691b1293d5404c79c8704861 SHA512 42a91d28a4ba8ad0469da2135b1ed27c2a736800da2d92219d249c9ae30a6ba4f3eb9cfd19f60e5176cf4b54c1b78df43818f34180828a8614da0a0ea62b5fd1
 EBUILD selinux-dante-9999.ebuild 279 BLAKE2B 548731742d7433243dedc4c2f75bafe8903cf329a703384d3a9dc47e2f7f98aca791f8ce6253b208977474a41d2dbeedf0303857da938958761c308c08f14db2 SHA512 fa406df18d93050b8ad60860396d76cd9cd6232f547305ef802eb6e26069e4c1fd621638f654753e7e72cb0cc75041b4695132c634a6318ab37c311fecef79ba
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20190609-r1.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20190609-r1.ebuild
deleted file mode 100644
index 7f5e5c8dacfd..000000000000
--- a/sec-policy/selinux-dante/selinux-dante-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dante"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dante"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dbadm/Manifest b/sec-policy/selinux-dbadm/Manifest
index e5f5cb0fd581..aa8909a7aa15 100644
--- a/sec-policy/selinux-dbadm/Manifest
+++ b/sec-policy/selinux-dbadm/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-dbadm-2.20190609-r1.ebuild 277 BLAKE2B 28efaf20a5fe99779bfc16a567341d45397e38af17c83b8082ecdb61de147174654eab7bf697e247b8d619a49e6c8686e7435f2e1bf63c635c08fbd64c19f1bd SHA512 c9ae2b7254898735eddff20c3ac01e50c5f7949ac9d994e693750d85826a7c33068ed0923c860262e31d79e323a21cf0175dd9b92de990629c4fbd486187c14a
 EBUILD selinux-dbadm-2.20200818-r2.ebuild 277 BLAKE2B 9d5f09dad886e6834b0a1fc6d0fd9b52b129f258f1af89935a6413ce02c640d242c2d557a2ae3ced049005727c449a3becf3b32c86792bf4d8826bbf434494a2 SHA512 860c14aaf12eef786651e007ee0fb8ea6744b0dae35e75a6fe78d9a8f8fcb41bdc4ddf623c8850d4a4dc1fc5d1e1c79979bbc819a1467c13fedd753e9627f0ef
 EBUILD selinux-dbadm-9999.ebuild 279 BLAKE2B a532807f5648977633940382bb385e6689313b1b148a24e69b638809af030851b26e74dadb8638836e5f6186ba62749de80015b37e0021b66f03a43caeee819d SHA512 5a1e0b8931bc8fb1e7b23450dc45565d5ee5bfaf10fd1e2ff5a87f75e1d0cda1baefaefcc9a7e5ac74e7266a7d7a4cdc0c1056fb571ef26fba487b692fad104f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20190609-r1.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20190609-r1.ebuild
deleted file mode 100644
index 1debebca55dc..000000000000
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbadm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbadm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dbskk/Manifest b/sec-policy/selinux-dbskk/Manifest
index d7140867d72f..83fd60652c0c 100644
--- a/sec-policy/selinux-dbskk/Manifest
+++ b/sec-policy/selinux-dbskk/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-dbskk-2.20190609-r1.ebuild 371 BLAKE2B 05414c7737864d5243bfd3a947a295a616dc8fb9a8b0f48c8aff39820bcd017f00bdb59c0d9354dd3a03aff953211bfd7f82030f51e72469940a03ad0089ded6 SHA512 9103eeb2c44996e914631b4492c7d2f1bd289f701609ca2571b48c8ecea59f5de848f851e90803156e16ff7d8c8faa55db6e5cbc778157b30d58a9b3c41c3b64
 EBUILD selinux-dbskk-2.20200818-r2.ebuild 371 BLAKE2B 801389975cc469adb672a29bc62016f1a2377541349758f7dfa15262b9d56766078cc87e9ae118e5a1afc88dc7bb961e3bae3625e95d9854fc4596d96d3b61ca SHA512 2a93dfd129d9b19268a206cc3b103c9b664b892d1a02dd54fce17cc21c2984923e4f7fec6014297c87812876c76971b4939f4cf16e0da67455cbf57037ad912d
 EBUILD selinux-dbskk-9999.ebuild 373 BLAKE2B 942a4c05a8326dd7d02a774f255352d50305562f7d33e969568f5ede2b92895b3cb4622c015e4135644d35c90f819cd4f1cd0c41d4c43843c025a18598a3fb68 SHA512 5d4f20ef145d3031115fdb53bf56e12649a035f74436ef0767106b5ba7367d27d71ad735213f9dbdf37db3d21db66e700bc3890d35a6523ee8b09440b3fa9a9f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20190609-r1.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20190609-r1.ebuild
deleted file mode 100644
index 08be811020b4..000000000000
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbskk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbskk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-dbus/Manifest b/sec-policy/selinux-dbus/Manifest
index 7509d135609d..6e1967441bb0 100644
--- a/sec-policy/selinux-dbus/Manifest
+++ b/sec-policy/selinux-dbus/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-dbus-2.20190609-r1.ebuild 275 BLAKE2B a9491738dc9183b7e38952a32181baf2f227501a12ed5fe652c2db9aa914b92fbe6676275cfcd74371e77ea79bbef76f1e5b10aa045b9433b4955d20cdf0e719 SHA512 f0e6630aa8f2e260b4e947be9dcb1c3af816566971f9e3ef1f509e451eb93eb02a88249f8198e4a74aa9a448b12f86bb9f912b917bffd345e35565d69484ab0b
 EBUILD selinux-dbus-2.20200818-r2.ebuild 275 BLAKE2B b0e7fbf32c2a0c38c5bcdacf5c9c1cb40072261f7e9d66f787ec5f6fbe01b08a63a7d36b8a4086fd211855e0a3fcb0da122635d7054b6212433c00179bdf6daf SHA512 6b07d73021353aa81743fb0be17b0853507df4b0e7ee442d8e218d7bb4a90b782b31f6ee04cde4c7ea5aead501408659cee0b630f249b3bb07d168db407efc16
 EBUILD selinux-dbus-9999.ebuild 277 BLAKE2B 215400c7ef06bec2cbf63980159dcd915b3b5c5e80e1cd3cf0d840a81f0b3901fde0c16b4e445fd47df72767d00560a6cce02696e0f67eeccc74d4669aa3e46a SHA512 950897573cbd040b6d61c4efbf757cbc75bf770a8d17bf15e430331cd0df9076ffa2191742e14387e5811e7a666dbce75724a801f547bb7c4b1df9540805df49
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20190609-r1.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20190609-r1.ebuild
deleted file mode 100644
index 30e4ce38da9e..000000000000
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbus"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dcc/Manifest b/sec-policy/selinux-dcc/Manifest
index a2dcae1a2fb3..e8fd7476041f 100644
--- a/sec-policy/selinux-dcc/Manifest
+++ b/sec-policy/selinux-dcc/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-dcc-2.20190609-r1.ebuild 273 BLAKE2B c094d9a9b14f1cdf111fea9c86cf30b2c127a65895f8703b2c3bd1af026ecdd1380d9ab590fbd44611490f13741708fc4a3515fa5870669042b23893eb965578 SHA512 87a8edce662ed6b3a78d629cf0c6cc95af85c75d53d1ce9b369e758b24ff113094db2678872b52eec4aff6fdad486de95666c2aea8b8b2e3b582d51fe9968e03
 EBUILD selinux-dcc-2.20200818-r2.ebuild 273 BLAKE2B c8b3b46266b9045582394990c7f02a32bfc644d6bb0c639c757623183c8b08779a8826f2fd93c557784ac507fba373d43c5ed9f4b0561aaa1ac3fe4bc0e0c0a9 SHA512 3c08f772516d411bc23e97187ae988755de669b3556ffdcd17302f6d1140231a39d7272db525a20203c4b069073e96fdb78da8ae8569495fd957483de75f5c61
 EBUILD selinux-dcc-9999.ebuild 275 BLAKE2B 8d295914364996448b9d6e59c92d9723d000b529f9e266641b36378e9af6618f137e279110f112b341726b96b756184280bb4fdddce03fd74cfa039c6a6e7072 SHA512 49f4037b8cf29ab8fc43210551487dca989fd6def18462062509b01e8b739f280b056b8351175bc05ba54d2f4d6d3713546c51552f74e8a2e7b0f2981fc313a0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20190609-r1.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20190609-r1.ebuild
deleted file mode 100644
index 3daeb35f2884..000000000000
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dcc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dcc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ddclient/Manifest b/sec-policy/selinux-ddclient/Manifest
index 94d3fca1fb0b..33a1463f4fa3 100644
--- a/sec-policy/selinux-ddclient/Manifest
+++ b/sec-policy/selinux-ddclient/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-ddclient-2.20190609-r1.ebuild 283 BLAKE2B 35ad75e94be50514e92b4daece3d1932d6f196f6dadc4b908e06979bff0608d6ad8bdcb00a5659b4227e2f0c97d9c4cf7217c54c9f316cdc43dfdee99bb67cd3 SHA512 b99e4ceda0d97c068bf300798b6d935e15219d03e3d928bf1910aecd5c233e2636ba893fe26072920bb509662fe090af5eb5e373ab6e73122031da150deebd10
 EBUILD selinux-ddclient-2.20200818-r2.ebuild 283 BLAKE2B e845693b722b2efa901395d81ebc662d043e48de962ba2dd9dc2ce34cfe6c4333f547bd38c246dc3b911678e6ca2fb18db1a7f31ad100fa05bb1dadea6fba8a7 SHA512 24d7b1322f6e63e90a4268de585f550963975e7762d34cd5c69643c595b6bcb97a0318501251c34283fb9ebd29b829b980595c4ddc0c2c149efb06978688cbf9
 EBUILD selinux-ddclient-9999.ebuild 285 BLAKE2B 04c7ab1a16b24cf0dba930c550e08db81a3a4645f4e5b14234f4eb2aad9809938f123bce9c9bece32d2907baa497ece8c71248e77c1a0e899a0b1de81bdc9d9c SHA512 9470c2f5a31cbdd4adf0f961863eee8f9c2ddcaaa1e148a11e974dc1354df26e420e75b06c0d2c8ecec9da8f4618edb38210131aac5f14a3fb4703425fa2d5b4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20190609-r1.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20190609-r1.ebuild
deleted file mode 100644
index 1048608aedc2..000000000000
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ddclient"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ddclient"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ddcprobe/Manifest b/sec-policy/selinux-ddcprobe/Manifest
index fcdb678f162c..717cd2139cfe 100644
--- a/sec-policy/selinux-ddcprobe/Manifest
+++ b/sec-policy/selinux-ddcprobe/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-ddcprobe-2.20190609-r1.ebuild 283 BLAKE2B ed08627d0f9f1a380f615d95231e3f2c390549ac23c93aaa3215bdd177175301823ec5dba780b428f6bae3eeecb51d6fbc8112ae08e4df63bdf0362351c78e6c SHA512 aff334bef287179e655a4a65b874f2a83f90a44bd3e5868136f712ae6984bdccfde6db7b00e07afc4a8c2f6df30163046abc3f53b5856bab309250809dc295a5
 EBUILD selinux-ddcprobe-2.20200818-r2.ebuild 283 BLAKE2B c56f2d077af8163504ad293aa6cbc26f5c79814b2598c75dfb2d0f0a33088e66b5bd6235cca586c241c0452fed53d9ff229802b68b26ee00626bc71aa3efcef0 SHA512 8c9b779f4c92e9185323cf2b20e903117f565265fbb41a0222c3eacdc821d0421f5b945b2a505a6c554c3605b411c92a6e0877fc4595bb55e5077201d26b8757
 EBUILD selinux-ddcprobe-9999.ebuild 285 BLAKE2B 9490909dc1f98304a19a1b568cbb420e1174a30a9fcf713e0bc4254896b5e4491f447cddb358a39656c70cd93453bd13a74c2592048dea2f5af115eb9d4f2b67 SHA512 94dad3e9b00ca89eceafd6627b317253793ba95178a1325584024acf1c92fb52dc1f859b86ee9162486ec5f4aba6cfdf3624f9a67ee064a0c00e990db20e9de0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20190609-r1.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20190609-r1.ebuild
deleted file mode 100644
index 5373462a1fad..000000000000
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ddcprobe"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ddcprobe"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-denyhosts/Manifest b/sec-policy/selinux-denyhosts/Manifest
index dd2c72bd7f28..f17a37e12242 100644
--- a/sec-policy/selinux-denyhosts/Manifest
+++ b/sec-policy/selinux-denyhosts/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-denyhosts-2.20190609-r1.ebuild 285 BLAKE2B 6b4f1595a8327dc73c9d4222da545d68848cd7ebeb51962babafc86135a5b4b6070d1d73a5e1d383cb26acdecf3c0a3254bd2768691abe783d26c9d940d24eae SHA512 5653388a0fd7e8527b3b6ce127c784fa353601228db1a1528970249fc65c0a816d77aa72a0b3ab74f453fe5f10818e2159af20ccf0075485be9aa45ca5858578
 EBUILD selinux-denyhosts-2.20200818-r2.ebuild 285 BLAKE2B 33770359220113be7ba3b93e7a57a5ed9933c7f9e4ae04dd9431f3ac4d7485bad1e7b9ec6114d072cd6182a804f1a2e9dfc3314064050fe82294766ae4d203e4 SHA512 f588f82b6e2ac932dbc61f0363c2a443ea395823465e9c0b60d80cae90e62fc11e448547e0291f3708f504659d46dfaa40edc2a0533eca08ca6291d40b96e489
 EBUILD selinux-denyhosts-9999.ebuild 287 BLAKE2B a963c7e0a720cf07036ef41f787b2e7e79ad81c0a22ad4e3bb7a505f07d7bb7ac025aa0bb75f2d764889474f4b270980145aeb422835c9c8aaf2cc7165a36e81 SHA512 a260ad6ba02f56c8b6aa57e15626f9b17742ac868f16f3168994702eee9ef432d1b2c7b93f2dc16214936a976b9557406b8901a6177a1a53221609915e06ccbd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20190609-r1.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20190609-r1.ebuild
deleted file mode 100644
index c5821f7c1996..000000000000
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="denyhosts"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for denyhosts"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-devicekit/Manifest b/sec-policy/selinux-devicekit/Manifest
index 76219f876ae0..fc36d6a15b75 100644
--- a/sec-policy/selinux-devicekit/Manifest
+++ b/sec-policy/selinux-devicekit/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-devicekit-2.20190609-r1.ebuild 378 BLAKE2B 392c872538fc605ad613f424e9cd9577a89511764b7c29f6c1b5369d72c98320ecc274abb7b9dfacd6756b5554753e0e3bb2bc7a18597e49cde457dc8b5126dc SHA512 6c5b0cca97b084d82f4f17a43a9598d70da5bd92f9545348ad13cdbca136243c04652e233f5e50d5a1f9f838640e345a80efcf556ae2733c6fb3ea69f193324d
 EBUILD selinux-devicekit-2.20200818-r2.ebuild 378 BLAKE2B f04f3e05c50667cdc5127fc8d86510cd84b6b4443d06b36b7080196e5874eb3c54095869b34ded07547502aafdaade079d53a60d2ba5cc52aa916411dc183499 SHA512 8208e3d931bc655ce9c9bdc72bccf747b77b57e77425e9ca3c3a77aa6ec67e1b873fe228ab33e57f6e7e35a54a05fc6b2ba2e00b9811c9bb31176fad22bf25b7
 EBUILD selinux-devicekit-9999.ebuild 380 BLAKE2B 26041390419ee905df3c32874f34a9782398ee38b025f694d245dde8fa91b4e006fee4d5b95423fc71b0f4cbade424e17e7ec86bfeaf1a1e1f048f8c314edb49 SHA512 af77ba4613fbbd287e76e37d9a92bb5f700208d1035f484043878f1a7d0cc46c0d3228e8d2c67a920eacabb96258866a712b8a20d8cec21269485c55a5514bee
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20190609-r1.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20190609-r1.ebuild
deleted file mode 100644
index ac130b34a23d..000000000000
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="devicekit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for devicekit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-dhcp/Manifest b/sec-policy/selinux-dhcp/Manifest
index 5854f32d30a1..ec4679ad7ff2 100644
--- a/sec-policy/selinux-dhcp/Manifest
+++ b/sec-policy/selinux-dhcp/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-dhcp-2.20190609-r1.ebuild 275 BLAKE2B ee6de3772a5a3c3562616c5832f893f523ed8cf331a71c7aba0fc3958464dfe622f5be865f6bb01dbc75accad5081c2308393622e785c4806059b261129dd72a SHA512 6631b5fb35066e379f28431493dfd8e863090c73a39ab1aff118190ffca7481b4660d5b2de1c3f6bc3f97676529accb286ddde7dcc6748e5921604725d1bbbb1
 EBUILD selinux-dhcp-2.20200818-r2.ebuild 275 BLAKE2B c4a4c4e83b270e0f656b5c06e8edbf0f5af7b1d5bddc748bf0204b882754b6ef609b02a6220b4d3a68656527eed17441e46cb3df92233dd0e8719b7e55db2e5a SHA512 5583ab2e90324a7cf84f568c3d33d1b887768fa539100975e1e1a0eaa26437f7be073f90411d4043c08b0d656961820111636e1cfe64581d47957f64e2921e91
 EBUILD selinux-dhcp-9999.ebuild 277 BLAKE2B 34e4a0e80b0acd1ee31b961d282ec2bd2bf5d9e559623059390bfa499edf33baa60cc12ee4fe6c9652961df7813b5a81517a8347f35d926ec1989e8403365f7b SHA512 c4da179b20fac5197d3b30a5ba917e5dcd3ba15e5f53443ae26c573f3ad70bf536b5e488e23884ca5ecaa7f999d210effcce856ebfb07c5b5ac9256d17d413f1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20190609-r1.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20190609-r1.ebuild
deleted file mode 100644
index d735edb05ccb..000000000000
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dhcp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dhcp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dictd/Manifest b/sec-policy/selinux-dictd/Manifest
index dc3ae18e2b56..e237a045c299 100644
--- a/sec-policy/selinux-dictd/Manifest
+++ b/sec-policy/selinux-dictd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-dictd-2.20190609-r1.ebuild 277 BLAKE2B 6d05f59324304a0fe2680248e96bb65dac409e32b7cb947f4b96cd6aebf17ade49af3dad168c640785dcfd3b935dde765075f4e37fe6995410b6626869db9431 SHA512 4d434d0b8183ca31d196af84004456982239b7cbcc83e063cd795063df16c8f12ccc00d294b4819ded45dc41a084568b0a534ad09e61ca5c7b9f71db98483508
 EBUILD selinux-dictd-2.20200818-r2.ebuild 277 BLAKE2B caa8ac60c1497e018c11e7c0a994e99397e71835946430137403fb8ded55b380435e2aba3bc9e2b905938fd0f248215bb6b12a407c393729b860ff23665c64d7 SHA512 7988e9fb7fa59beeb19a2df97d8c0013b7c747392db47fe4da8c67ad888e7625b32833b5f251efb55b4b057d69e67e3584d3fec87e6533aef19a2b85989cf4c8
 EBUILD selinux-dictd-9999.ebuild 279 BLAKE2B 8f976a2000d06edb7b42f7c98920c88e2bf4c3244282ebfcf5b71b4b46aa461cab9e8b0f41879f51605ab792f8bd3dc1632f99ba122395655b9882d9deb5006b SHA512 641288fdcff6a02969bee98cd5d770812d21f879fcb76fd21085df5c3726cbb3fe45956391a57878cbb6b57b98344342847c9f95a835da9558e7fb85128ccfd7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20190609-r1.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20190609-r1.ebuild
deleted file mode 100644
index 10ba9a6a2e99..000000000000
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dictd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dictd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dirmngr/Manifest b/sec-policy/selinux-dirmngr/Manifest
index 8e4947e9f788..0bd3ff6c199e 100644
--- a/sec-policy/selinux-dirmngr/Manifest
+++ b/sec-policy/selinux-dirmngr/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-dirmngr-2.20190609-r1.ebuild 281 BLAKE2B 77cd7f47e0d077c7bfa1888b1e2783c6d6e413894bcc2ea87e780077b169967760370b18f0a2fb1c6810dba68d2b4aca159027a5b49aac68be982ca3fe6005f7 SHA512 13e6fddc9ac34e53d82458523b181db4e25d50be9772dddb7f26c283ea3ccbdb028d214e376bcca3a6c28065d2a633439b804540d04b73431e18b29bf74ef46c
 EBUILD selinux-dirmngr-2.20200818-r2.ebuild 281 BLAKE2B d32934c7ce3ac4e784c012e2a52ffff136beaed37b1bc514c83ccb7eb0db6a2e07235566adcc1ec0fd5ee8677f0356844a1493773363e8ac00b11aa44641a47e SHA512 bbd70bc8d09cff197c9002a0ac7ca02f70b9e161f64477155d67ab8921acf6553e161db9d831c0e17266b27356bd5c27a8b60fd3113dc760e350174c28ecf7b7
 EBUILD selinux-dirmngr-9999.ebuild 283 BLAKE2B 89229eeae441a1f355305f427940110346553733f8ffed575c8fcab716811d09ebd4f0ba59e875bb1c5fc6e507f23988aff1fc921e6bf1a9a8ea208fe6de0926 SHA512 d86f3b3150b66a555d7e0918fbffa8ccefa1ef89b9c870955bf51d8dee34788af1f92ebb091e978dcffc3bb94a2b908a0cce755d6b0cf2ab0b0d1e149029e6ef
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20190609-r1.ebuild b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20190609-r1.ebuild
deleted file mode 100644
index 08cd2e747812..000000000000
--- a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dirmngr"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dirmngr"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dirsrv/Manifest b/sec-policy/selinux-dirsrv/Manifest
index d12307f997c7..9c299f7ca311 100644
--- a/sec-policy/selinux-dirsrv/Manifest
+++ b/sec-policy/selinux-dirsrv/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-dirsrv-2.20190609-r1.ebuild 279 BLAKE2B 501751b7a507e21f4145bee3233227a1c877ae6b513e17a75eddbddf771ee3cd95547acc7070fa98e92032060de2fb56c7c603130ad5bef55e6a621ccfe0526b SHA512 8d9c9d2e079e937ff02860e903c35144a8cbd513197bcec928ccd2b9cb937c4c2764e863d247823abbac21be6193a6170b38fd434bf9206544d13e41c585139f
 EBUILD selinux-dirsrv-2.20200818-r2.ebuild 279 BLAKE2B e5d936d84f8964ff4fc0faa7be3dd7ab6dbcc629585779b09597ed74638e3a5af75b34b9c8ef5a9fc739b6a4fc676694ac2fdabcfb887dd89fc51f80bda2d6a8 SHA512 b0c787a1791048c02789188d671fa693fb4f1cb130aaae86330852c3e64707b404da49f4e451a2ad19cc9ba26ff21600fc561fe27e1e35d65c8b3f2f1a917bd0
 EBUILD selinux-dirsrv-9999.ebuild 281 BLAKE2B 23fb811f3759a0c9014898441607c706dce6ea6669dba3e1fa8261e75581c646a705f4317f7ef228f10934e5a5ac68dfc62ca495f6bf328d92b763cee8000b2f SHA512 ecbc11eeff50575ba2167c35db9701a7ebceb848d8af26727a2f7a904b1dae8032510c973e83f7a944a02de561ea940124e42ec73ecbcc84708bc8f12f473c55
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20190609-r1.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20190609-r1.ebuild
deleted file mode 100644
index 6b25630e88f8..000000000000
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dirsrv"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dirsrv"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-distcc/Manifest b/sec-policy/selinux-distcc/Manifest
index c59a7a21c8e4..1fe50e42312e 100644
--- a/sec-policy/selinux-distcc/Manifest
+++ b/sec-policy/selinux-distcc/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-distcc-2.20190609-r1.ebuild 279 BLAKE2B 3244bda2af3fcb1e29779cecd0f1fea9afc018741eec4f05ab95bde12a585c3dd2ca0902455b931da1a6d82d73bdea96755430032de4304232b12158481ab421 SHA512 469b08e9846b838887f856b5a07bbe8244f6902c6d673d08e0258e5d7d46ce861ee0f21dba7645efcc37a75859b37119197496dbabad8a2ddb85773c57ef2ec7
 EBUILD selinux-distcc-2.20200818-r2.ebuild 279 BLAKE2B 0717fab809ccb1a5ce3dfe9446ff180b5551696b92fd8958f7bf342cb19c29e7c2b8713ef1d403cd98922af9a99fbe59e57b7802603567772141fa18ac7fa34b SHA512 c0d0f15b2ea7964d76d96482454318d860289c199b8decb95f95e6e8b626ad2225b074d908566b08013fde9e738d9baf573e9b8e57d0568230feabd5584f97c7
 EBUILD selinux-distcc-9999.ebuild 281 BLAKE2B e032ae6c7013160ceab0504fac8a83a5b032fafd12307ed46564cf5e7c1a2768c3d2a4534c84c5deaba52cde93069231b91a8d872b46a21de5cbb2a7b5b50851 SHA512 c9ed79dfaf01f01ba45a73ca7e849b6dc6b52b95070d54e3694e687ad9fa932aee901ec7af1666420073077288434d16feaca5635965389ecb251d6666412b4d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20190609-r1.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20190609-r1.ebuild
deleted file mode 100644
index 1fb57712c541..000000000000
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="distcc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for distcc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-djbdns/Manifest b/sec-policy/selinux-djbdns/Manifest
index 759b36a84296..9db84483f8b6 100644
--- a/sec-policy/selinux-djbdns/Manifest
+++ b/sec-policy/selinux-djbdns/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-djbdns-2.20190609-r1.ebuild 443 BLAKE2B d518ce7c5f327ad18b9e9b6a2b9b8ae4d2aabefc1c2fc85fd1568dd64ddfdfc9cda3cc37b0f3bf443ddab275fd11adcbf3a5bb2720450ca6e21ab3e3617555cd SHA512 96c710ba8fff53d7052b61d4419c59b89892edca136604590eb3ecd1cf50dfc1ff71fbd11df5b92a89b5beec097bc78f282c7b6bc1509d0370edf889178b5b2d
 EBUILD selinux-djbdns-2.20200818-r2.ebuild 443 BLAKE2B c2222e8210f5d4c8859fcad81d2bcc1011e7cd7d6a53f639a726bd682816274a8cad6d04f09310c7c7c70f5fdf3448bd5d454e16a972882169a6300f50d0d0fb SHA512 e75f6f87ba6f4dc30aa6d0217edbaa494e0e59297fcda6d7d4f9a7bde038e71162e494e26e04001baa3f4c451996be76e04f28fbe75721cce700bbfcc7e0ab69
 EBUILD selinux-djbdns-9999.ebuild 445 BLAKE2B b94961d2e6424a1d1aec5ae1b6dbbc2cc8576cd97884d8cfe2d69b7d3cf3cefa9dbfa064f3a1741b2372cb5e0f20e665f0aa01ea7d6f9215af245539ea000160 SHA512 ab060097001ac7bc34650c0a9229726312fba18e4584c19d6870425bf0bdd7514c771ad02277676e27149a22e54e8482d26254bc7a113529424a2a6be1404d02
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20190609-r1.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20190609-r1.ebuild
deleted file mode 100644
index 99eb073c70e1..000000000000
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="djbdns"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for djbdns"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-daemontools
-	sec-policy/selinux-ucspitcp
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-daemontools
-	sec-policy/selinux-ucspitcp
-"
diff --git a/sec-policy/selinux-dkim/Manifest b/sec-policy/selinux-dkim/Manifest
index bf20fc184e96..17b854bd5c7b 100644
--- a/sec-policy/selinux-dkim/Manifest
+++ b/sec-policy/selinux-dkim/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-dkim-2.20190609-r1.ebuild 372 BLAKE2B 881502b798ffc5bdc49ea1f43e8cca320c00fc9930f1f3f612bfc7dcf25356a926b43e87c79777a2f0ddaf8b073596afbc37d461eaa49ca1936ccc7371c95d5e SHA512 9ceccdaef3cbdb02c998b4ff0d8a7839bd1e07dbcbefc51fbad98d04ef4af57dd61df6b00d52bde819f517264058d5943d8d03d35141324d7dc9389541579133
 EBUILD selinux-dkim-2.20200818-r2.ebuild 372 BLAKE2B 1ceba7b0b4e5b28f9be3360aeb1d03d4c2d90d1f99f4b4867386168a4e151d7116d9a7ca1d49f9159f0d1f9bec3308a80df3fd142a78f03aed133f5a3a2affdb SHA512 1fc786c8cc03393b62ab810cdf101ea1fcc6350aed2a65bfbea1053dfee8a442b46de76d8defc8f01486758300b79d6cce3e23ecef6c41c0b420ad369d3cb421
 EBUILD selinux-dkim-9999.ebuild 374 BLAKE2B e7b242e7894a64e08d2fff592053402e3b59a51282f633c80bd82b8c936ba526592b8ace22a1164ef142ea9d239198d9f51611717715cacf9c63a20e6601da8d SHA512 fb8167cd5d55673140f0c6b11e0e3949d94e5d52c388b2b51b30c72ee5fc241a9a4e4791538e358c559e93c51bb4ca437d21946623b4386216e18c48a059b37f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20190609-r1.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20190609-r1.ebuild
deleted file mode 100644
index 7becae43bfe7..000000000000
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dkim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dkim"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-milter
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-milter
-"
diff --git a/sec-policy/selinux-dmidecode/Manifest b/sec-policy/selinux-dmidecode/Manifest
index b78a4109cf97..5e2a9801c409 100644
--- a/sec-policy/selinux-dmidecode/Manifest
+++ b/sec-policy/selinux-dmidecode/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-dmidecode-2.20190609-r1.ebuild 285 BLAKE2B 0183609eca2dc0e65f761e7bea2a1e5f398b4177fbc3aeb588ac71d1170c0a5fd49a4d9e222bf35626278e3e5564852492e1f4b0ce73970c67a120d26eeae0c3 SHA512 a587e1552c2d3adb1cabc31bf9759bf43a6ba5c67e8cc69fc6840afe32d3f807825a49490e59fcda7f08b705990e151900b8312a8549f079cdd1d082c24d2026
 EBUILD selinux-dmidecode-2.20200818-r2.ebuild 285 BLAKE2B 5e189921cdd7ec1e53e2fe1410a1111e43c896368254735ffec2fd64c744f92ce1170dab6668d67ce30928cd3677feb6bb5a2da3e054f7a25284dd8935ede781 SHA512 87c0675c21521eecea58e60850e9b97d8480511225a0fb2c082ee7e844e308841f51375a18356f2e2f0f345293491cfe1f0947c01ec173f67722f66eea175423
 EBUILD selinux-dmidecode-9999.ebuild 287 BLAKE2B d9b54401e667a19a0a3a7b6769919a2aaa9771dd47f8b8106ef15385c813d43e2dc623b92dba34ee2f21f64628b594cfec1fa78b214c568d225aa1056bd84698 SHA512 21696406d4eb24aed6e861dff45da872f4006865c5dcc2f20e5dc0463ee33420b6fa6b8ec44b3f96a2e965624bca5f928923c8c205794a2ff59031b917bc08dd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20190609-r1.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20190609-r1.ebuild
deleted file mode 100644
index 50fd2aa6b619..000000000000
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dmidecode"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dmidecode"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dnsmasq/Manifest b/sec-policy/selinux-dnsmasq/Manifest
index 4298635dd1b5..b62d4e7542db 100644
--- a/sec-policy/selinux-dnsmasq/Manifest
+++ b/sec-policy/selinux-dnsmasq/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-dnsmasq-2.20190609-r1.ebuild 281 BLAKE2B b541cc440e79c453ea154c11c5ec5797714391a114a86c2c1080d852c1bf3d16819dc51d4d72369fcfea222dff2745b448915bda85f7028cf9faea58ea37e00f SHA512 280606f4918965e8c0402b3bdcae1e5862ac6a01d0f683ab6c7bc86d2b4015ffaa4c5105f831975a75e70b5c71b2dd7c06f465a50074d10883d6214d3b5c537f
 EBUILD selinux-dnsmasq-2.20200818-r2.ebuild 281 BLAKE2B ea04c251ed8af78e78fd079770a1a257730f352697336dd50d2025b3380ca4e7db6e53776b7b0269689d1214375deabcfa8d241aa51542d5d03f604d8d331b71 SHA512 c65ed7754d2d400757b52c2321e2698a6ed271c23ff5aad9c8814ec62ac04aff4949a0d9f319e8e88d21d91958c13e0bdf4f84cce77556ce603153cc1725e55a
 EBUILD selinux-dnsmasq-9999.ebuild 283 BLAKE2B 893f136d8cee4609679d3e4a3cd6402ce8fd761c96be00097ba440802bfdb2599c3593798a0fecd4ac4ddd471887f1bba09400d91d2e152df568718167347df8 SHA512 3c6a3221537975b12a31b0bf3c83370d0f599116ef7bbb11140090c5d0ce30f5db2130352036bbb1833d10b183afef80fc2bb902649b87bcf096957fe1e3db80
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20190609-r1.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20190609-r1.ebuild
deleted file mode 100644
index 6bfbbf392abe..000000000000
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dnsmasq"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dnsmasq"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dovecot/Manifest b/sec-policy/selinux-dovecot/Manifest
index 96a6cf75e110..93c60a1df4a3 100644
--- a/sec-policy/selinux-dovecot/Manifest
+++ b/sec-policy/selinux-dovecot/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-dovecot-2.20190609-r1.ebuild 281 BLAKE2B 5539d2b762b8e6f24beee1e50511116e7e3abf0b0f1921f6f56aa1eefbc188f081e4a2c18dfae391163aca9b8349785e0d1d50afedf37fe91d984a59d629caac SHA512 aee040f922df93eb224e3109bd0d80ab7c839660750fa805e539050f2808cbbfb32f14a938010f59249413a79d60883ef5cfb8b48ea5b7ba18c7ef14132f227e
 EBUILD selinux-dovecot-2.20200818-r2.ebuild 281 BLAKE2B 013b716949ad97c713c212061dce44f8d7a6b3d297b4556a0b687830f867489f6ce0be14fdb572d7ed6aaba99ea033bab3c1db8c8cb1609d03a6d6ec2494cc9b SHA512 a770bd1f37a178185cb905b884ae2c22bceee8395240b46ded681b22d263d30988368d820aac672763cd926c8b1a8db237bb66514ff3f6cb812b77ee200c059e
 EBUILD selinux-dovecot-9999.ebuild 283 BLAKE2B 9a33f1342985c987c69c3bf49dc7ec52f0c73040525544eabe101aeac69f1d445268877e2d353bb41322529ae51372810b36224e81ae10d17514bbb1ade13fee SHA512 016373573d3804053bcc65b449f739b0feaef959ec88f9d4168c6d8166f5dc803641e9218589ff37b84327726ad2a19719682fe2b25d42cc917dbf3c775e33b0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20190609-r1.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20190609-r1.ebuild
deleted file mode 100644
index 1e1f33ba3fbe..000000000000
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dovecot"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dovecot"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dpkg/Manifest b/sec-policy/selinux-dpkg/Manifest
index 737984832268..976c29de8afd 100644
--- a/sec-policy/selinux-dpkg/Manifest
+++ b/sec-policy/selinux-dpkg/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-dpkg-2.20190609-r1.ebuild 275 BLAKE2B c496001b4e478aa7a500d8269b7d2567a0742ffdeb38d24c7bb13fc18a70563a79cfeaaab9d251e4f2fda59bf66ef2a9a7e3b5d597bcec92f10d9f1296213a72 SHA512 7a8a1f242aa525cf8e79c66124172638a3a174d2fbd0d7c9703986f636eeef1313804c6ac82f2b9dbb20b71db4cc7753860039e146390df2e8408b324a3e02ec
 EBUILD selinux-dpkg-2.20200818-r2.ebuild 275 BLAKE2B 10ae1de00f3ea0c464bc95df582306b7c7ae34e15f99288c952a526cf72c1d5de5af6734efa4b554cda4b026723a974e24437416b646c87e48cd9199d75a8b7b SHA512 05a12bdf136b34c173742b79c07a15242d45d66c4608e02c9d7b516edb75359b3e56c6ea72db0d1bbf292e5b625e65596f07232a0d92f9fd2cb867751b24672e
 EBUILD selinux-dpkg-9999.ebuild 277 BLAKE2B 5ff7042831fbdbb3d2ad6790dd55ea6b87682baa2faa5b06de0561676d840e0fe3599f46524992dc96846eec0db50b437700abe4889dac7475e832543b5af2e6 SHA512 5475fcb4c6ded8919a67d85078bcd5c706d5c8a0d007ad701cf926659743aca2a9eae518a9ffc4437a145d9e0d66b10bda83cad89f606b70b9e31585bd292fd0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20190609-r1.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20190609-r1.ebuild
deleted file mode 100644
index 89cab8ca4b66..000000000000
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dpkg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dpkg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dracut/Manifest b/sec-policy/selinux-dracut/Manifest
index ef973fe7ec68..dc247f9b4d99 100644
--- a/sec-policy/selinux-dracut/Manifest
+++ b/sec-policy/selinux-dracut/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-dracut-2.20190609-r1.ebuild 279 BLAKE2B 46bf21cc75f942e0acec2f72b5d60baccdabedc0173ef374e9f47b42eb250f8b62a149caad2b76b3f6281899ce70bb113f5a2003d52759abacc4e77ef2f66897 SHA512 bbf24738d0df351060ca6d50d4ae1ffd6f645b9275ce3e71965c113d2bc699ad3b0963f2b1699641fb40862c8034d47039a686989be253e18d7621b18b75ca98
 EBUILD selinux-dracut-2.20200818-r2.ebuild 279 BLAKE2B a320bdf170902f4f40082f1cb6b9623fcf5f7235904364b222a8266d020087a4bd041b9ac1243d76c9804d8d01a6f8a146725ce0aabc0ff70d752c93be461bc5 SHA512 8ad2e43a20c93e239fe819f8f01b049590da08d7200b7a3a211a71a03ea0e2d73c0828f257626ab159b3d3770d571b7235eb6dadec3e6feb45c8f8786f9076ff
 EBUILD selinux-dracut-9999.ebuild 281 BLAKE2B 2103969db21cab145b9adda357c884cb70e1173f0dfe1e441abdb24b55cc117ce420efa6d71168af70a961f0db3e89298ee6301b76aa1d904946fe7a9a4c2ad9 SHA512 358a3f63e9ad4a2776e346840766374eed605194f0273088f66b86e513df267095ce9ed546200de68cc1944d7167da662ccc8f8291d7c01e9b76af0840011eb0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20190609-r1.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20190609-r1.ebuild
deleted file mode 100644
index 4666893b2dfb..000000000000
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dracut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dracut"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dropbox/Manifest b/sec-policy/selinux-dropbox/Manifest
index 0a42e3f54a84..190db4ca6738 100644
--- a/sec-policy/selinux-dropbox/Manifest
+++ b/sec-policy/selinux-dropbox/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-dropbox-2.20190609-r1.ebuild 429 BLAKE2B 59e515efb38914a1c85766d381ec4e5d99edf3a98cd74117562504b509a558e38abd79d023f871bc066bef72cb0bb2e9a0dddc557469634b15d5c6375b7bbfae SHA512 b5eba1054c0c2036988c002f3dc959dda7ffb9a95f38ca5ee774858e1e7034761c84ab5075b2653802d4868ddc977e58fa8fb0e41aa92f484cc0d3eda9e0515b
 EBUILD selinux-dropbox-2.20200818-r2.ebuild 429 BLAKE2B 74e0368f68a4811c0fe0bb6868b2eaea52fa7e8ab4c16a12f53f139325c5d9ee106fd5bc05a430d9511c153e5a8c31c1cc0b72c1f7d46ece76b32075af695142 SHA512 00ef100623571799eda64f26d1cdfaf36dfa243c0f1e172d0887c2841df62ae37dff86a0fd926dc693ee4608f6f0b6f5978f1a5b831a6ebb1b382fdf19266419
 EBUILD selinux-dropbox-9999.ebuild 431 BLAKE2B adf030fa61db09b66d01f018e316362ac888f574cd8b1f3dce2db5b8f83063871199e9a601448587ead6061cc887e4e6ba9065c3be32c1c1b0a59e95ca28b6c1 SHA512 85745e032f8ffca8391d066a80d2a74a3663b70f06495a05b745b7e754700d57b7c07e3abffb3cad1286c3e053d8e961daed50ed83ed24f1d839ab289b7e3e53
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20190609-r1.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20190609-r1.ebuild
deleted file mode 100644
index 62d5dc077a97..000000000000
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dropbox"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dropbox"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-entropyd/Manifest b/sec-policy/selinux-entropyd/Manifest
index f4b03e1f0d2f..fbfb938a5d9a 100644
--- a/sec-policy/selinux-entropyd/Manifest
+++ b/sec-policy/selinux-entropyd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-entropyd-2.20190609-r1.ebuild 283 BLAKE2B ddfaa596e04a2d4ec80e33a85f0be70f6b9fb52ff815769b80c67a09d18a85fbab4be9968d0e35194c05dc7cda86d217141c60552e9f31f52c60cf7c13db79f5 SHA512 9efe15f325bdec93833e2c532bb4fade3026c62e4121c46ee1a13014c565614fd8c459c56493734bcc05e456cb4fa81c5e1b9955c9be1f9eeb9b8d9ca0e3540f
 EBUILD selinux-entropyd-2.20200818-r2.ebuild 283 BLAKE2B dac68ea949ab1730e381dc1f1bb9c9b2f284f43aceec34e000700f03170247caf4efcec288f6c620c61f499249acdf5e0b5579f7faa62a978bcf5e4b70da85c3 SHA512 041308a4afc83c5184e050fb8559aa74fdcadb9b63fae09aa1d6b787e270c38e66d31a2261c3bd6d7c44b4e51fe854880d18609e455f13ee4a16f027ed726f65
 EBUILD selinux-entropyd-9999.ebuild 285 BLAKE2B 3f2bd1d69506dfb81df025523a6903239054c918879aac9ba6e16c639c387427d907e9309e8d8eb2968f8e2110cbdedf74eaaac062dc495729cbf5e4dcf5edca SHA512 18a3fd4af537620cb87a637dae97e9e030fec8073158f4e54d69216ace3ab68c301e4f8908b6697b59b29e67510b40b00248d11ec09819aa1754ef2d682f6508
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20190609-r1.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20190609-r1.ebuild
deleted file mode 100644
index bd0339fd2955..000000000000
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="entropyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for entropyd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-evolution/Manifest b/sec-policy/selinux-evolution/Manifest
index a1ea8c42b850..2b39d3378a23 100644
--- a/sec-policy/selinux-evolution/Manifest
+++ b/sec-policy/selinux-evolution/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-evolution-2.20190609-r1.ebuild 383 BLAKE2B 829b083dada4a82761531fc0cea1fe0934c66e6020d601628ec5f68a29825deadd878afc30b5deb3f4d019b08797d115f6e1fe766afc144c888364f7570bb597 SHA512 d6873e858632652adc46c7fd50a88be093eb39c021d30972b1c9847932bdf58fa057a6861d9c5b87a41fab0b6c836006178db5db879fb8d47268efefdda1922c
 EBUILD selinux-evolution-2.20200818-r2.ebuild 383 BLAKE2B 7734ed7ab138e67da6fe240d2ecf97e6087bddea562393664b504f18f4336a3883ef8d3ccd19acbf71564918410dc60ea68c4e47950d69d441d4b61052985ee3 SHA512 81d371b4d9f973df672cb6aa7c308a7d2d2a08dda99ceac44036cc963fbe48068ec7bf2f20d489073a7c8d3a68488fdaa768566abc75a94d60fbec7073dedc6b
 EBUILD selinux-evolution-9999.ebuild 385 BLAKE2B 8546c328c81c42bd774c95ca7b844e8db70bd489d5535969deab8f401514c0adc3f4dcf7059eb2b305fd32fb19ad66f45a197fccc05795e32bd4cbcb21fc02c0 SHA512 12a19aca10ba54a0d035a4bf38583760ba2f301657253a51f8d65cc4708d5402344ba0a0da978bccf23d52700f209f8db21fdb8834831ea1a71fccd8bd872a4a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20190609-r1.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20190609-r1.ebuild
deleted file mode 100644
index 091f6ae1dd82..000000000000
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="evolution"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for evolution"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-exim/Manifest b/sec-policy/selinux-exim/Manifest
index 94ea414903cf..6267cbf074cd 100644
--- a/sec-policy/selinux-exim/Manifest
+++ b/sec-policy/selinux-exim/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-exim-2.20190609-r1.ebuild 275 BLAKE2B e271f3fece459bb5f79e6e9ca7b36f834c252fc54edc0a60540e58b7c58fcb11a9521295a023be23ca21bb2d3f141531a752c649b9da5f1ee26a4fb8602b45c2 SHA512 748ead7aa541ef6fbe1a337d9b98a1bbb9d1f3698d4624c2b210376d7dbae6ff6cb44c51ce2782353ae9eefc11f09d8b64ec56d355a0972918557115c07bcc75
 EBUILD selinux-exim-2.20200818-r2.ebuild 275 BLAKE2B 710bbaf8e5334ee5e559d925012a002f2185ba02c6e736d0f8804c16aec9c0e75a745b3950c41c9abaf09f007c8f270ce7d5d8125a50a433a79cd8f59f2e191f SHA512 2f7b66fae34ed18baee7f07553e7f65f512c99c01b3dafe0a028966eca45b2f1d88adc70aec68aa5e5396966305809e45fc0e659801b5d8031ba3b6d38bd7628
 EBUILD selinux-exim-9999.ebuild 277 BLAKE2B fd68b3bd92c7a74c202d68211b8ba898d7ec6fecfc699b82c325d7109e1a717c96b901eb36cd2bcc49f0bd70516c8639b60bde62761c4eb67586e5c46fac8088 SHA512 7e7f304f70a631cded7e8e7f3e7e654c38dd506d53dd058b3678242d63a00e0109556be20d6e0c6b9ce0bb1357f7eca704234b2372ac63ff29a95d7a8e6cc59e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20190609-r1.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20190609-r1.ebuild
deleted file mode 100644
index 724df83e9453..000000000000
--- a/sec-policy/selinux-exim/selinux-exim-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="exim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for exim"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-fail2ban/Manifest b/sec-policy/selinux-fail2ban/Manifest
index 0f77d8034e11..cea6ae4cb672 100644
--- a/sec-policy/selinux-fail2ban/Manifest
+++ b/sec-policy/selinux-fail2ban/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-fail2ban-2.20190609-r1.ebuild 283 BLAKE2B b3f146efbb8ec4cd7188ff049ae7140a63f18b864e54fb3850828a8db24170265fd7334a898d68e1bf9f2030b8fb12f55b9d4ee2d33effd01dbd092220d3b69e SHA512 fb679bc7b119482300060cc87ed69875bca8c3c27f0236818a4dbbb373860337a52fdf1399758bfd068bb0b30a27f281288e6fcbb743d351b287a484e8e93900
 EBUILD selinux-fail2ban-2.20200818-r2.ebuild 283 BLAKE2B 2a3b8cd434185244dc1bf53271838024b5a09d44082b5471c9098a04cb3d0db8e903fefb8464c057333f049b53531d09e9a19cd94bbd602447b9bac2eb82e473 SHA512 949cfa5d59a390023f65c1bc1c6a8dd5ed6940c006bcfdd8ca9998490e819b7c3d5b10f9e3c3cc0c76e21612e78c730f15f56731f05fdf732a09a2553731c879
 EBUILD selinux-fail2ban-9999.ebuild 285 BLAKE2B ef64e435440567c13a61cd18f44357ea89f92e1ca231cf3b82f137ed2cf03cc5d8497675031fe3e3603b80ca63a1e57ea0c6ed07eca075354e75806952298b26 SHA512 7bbe6bba9042ee499653324a9d2cb55aa62e7b266606140a06ecf3bf91a07ca212d9c8d9af890aea7cafc6f481210a082466e49481727a9d500be5c7134632be
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20190609-r1.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20190609-r1.ebuild
deleted file mode 100644
index b2b0b8ee1ac9..000000000000
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fail2ban"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fail2ban"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-fetchmail/Manifest b/sec-policy/selinux-fetchmail/Manifest
index 3a74b5da157f..215d9f259984 100644
--- a/sec-policy/selinux-fetchmail/Manifest
+++ b/sec-policy/selinux-fetchmail/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-fetchmail-2.20190609-r1.ebuild 285 BLAKE2B 355d28801287926acb880fc96af9ce43f38acdfd5ef0c9a3ca2e24b6c7fdea476a7aef0a503098367743d4338f5ac16f367556871fd3fbf8eb40f02d77819004 SHA512 baab271254c6be609ddb755b626cb6e6840dcb10ef3281442fb1b3dc5e2400d6bb66831cadfbd5a6a6aba27c0b910c3b2aa05dbd14e167c17932baa5c62b4d59
 EBUILD selinux-fetchmail-2.20200818-r2.ebuild 285 BLAKE2B bc5c08567862dcc547fb8f9cde86dbe1132ce5e801e851440ddf4236e4e89a97af15b6e68e3851483a9fedd9a3239f44a4c41b342f373448c7fc876d9551ec12 SHA512 02ad975b53d5530301727817e7fb4abeafb66833cba5c77d5d391e4c577cae0484f29730456fc810682a8d51d7bf5ab63256cd6d353ac4ff810e6e68335232dc
 EBUILD selinux-fetchmail-9999.ebuild 287 BLAKE2B 76df777b04a09e08da72e3df2dad58fa5fd4a4d443ebd9eaa007b7591c763ca0cfc618c8b433d92d7c611a8b458f81b75d19ca8b0af006f3727b49e3183087e7 SHA512 4cb856b071c23c5da74e901b8aaa56d95873ee469442de4b225773f1c8135f6d8d1e9951eb95a9d68b976ec5637e40928902e9f0b18fdb2feaef78345e6f9b97
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20190609-r1.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20190609-r1.ebuild
deleted file mode 100644
index ebec93eb3d47..000000000000
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fetchmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fetchmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-finger/Manifest b/sec-policy/selinux-finger/Manifest
index ccd51dc116f1..79ccd10e83d4 100644
--- a/sec-policy/selinux-finger/Manifest
+++ b/sec-policy/selinux-finger/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-finger-2.20190609-r1.ebuild 374 BLAKE2B b8f8ffc14fbb19d2a259ff1f7bc634b35b31a9dc70b618a3732c19a8c8aaf5287f377021bcc8cc7f1d04faf52210fa3c74f87704706b4836e53aa8f139f8cf79 SHA512 ebb3f837bb8ee1cbaf0ccd8083866bed9ee70af5b881178b93eb679f206f6d36a0e4bc0e5bf015e530ca0d1bd55c2fdfcf7e03d3b3e0501083c3ee8ec7f4288f
 EBUILD selinux-finger-2.20200818-r2.ebuild 374 BLAKE2B 822b81f06350fac590b4b6ed25b3142ae63de7514d1e32920fdb26fb1820bb0bb160a3b85eb2ab45e3a104f7a2957007bcb1afa3a6986938e92fb73a58ad4041 SHA512 019bb83e3474929f409a62dce2ed95a3966d760a2afe168653dc1090d4dde72974257de48809a4606ec7d49297227edf0e05769bdff5b0408cad8c740539cce7
 EBUILD selinux-finger-9999.ebuild 376 BLAKE2B 3a5814d814519d5211a9aa96a30d7ade30d0598c9230dc1b5c8b5b0fb9ef80961070509f338eff0c6ccbf89c221481d8389fc345ed3afacd19863a1cd204cf40 SHA512 a9fbb39ca84da544d48d41a57c760e4daa94e9350e44b4c83bb5e9b75a9faeebf97de88b3b43be1caf08ff6b12365d5fc2039d40f00bae5aa2e37c6233a0e1fc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20190609-r1.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20190609-r1.ebuild
deleted file mode 100644
index 79c29efb8b8f..000000000000
--- a/sec-policy/selinux-finger/selinux-finger-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="finger"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for finger"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-flash/Manifest b/sec-policy/selinux-flash/Manifest
index 7338105524de..b8372b0da869 100644
--- a/sec-policy/selinux-flash/Manifest
+++ b/sec-policy/selinux-flash/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-flash-2.20190609-r1.ebuild 277 BLAKE2B 398723a3a2564761a10a3cc7b9d967563794da966d3c2ed6bef8bc45af8af80a95e954b65c9034fcd502cba22192a153e510035b69ec2168193839519c538fe0 SHA512 a3ede68add9f474d9c544f5b00848595a382a6b3e2369730402e601d2494400ebf623b856f1c66222128c3afb141dfa867cf4c98aba4911d175df51be23d948c
 EBUILD selinux-flash-2.20200818-r2.ebuild 277 BLAKE2B 5026237b0f7a59c27540b1f72789798f21c669421ba82b6ca35b37d4098200b975c7a32d53674d412249402e55f21aed8799db1597efd84b53beb3ebaaf874dd SHA512 69e9243742129f5dc15c49c98517f2f9a6e2114042886bc38dbb548cff29da1aad1e6337309f594ddeb6211bec25e3f5683db942d6149b43a9c8a7f1261869e7
 EBUILD selinux-flash-9999.ebuild 279 BLAKE2B 0dd9f2d745f66c18e4adf8c7c8184444a89c00c5965f0584a5412f7cfa0f21efc55164c76c7b4384d297ae420f357ac1ea9bc5f903e5110b0b39a14840411dcd SHA512 3a7cbefdd5d02a6363fb5fd8cbacb5dded9b7a5649d6ed6613c57c6a91deaabe71442b8ea29117d86496ff10309300796e541350d4df15383223d786dac2bce6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20190609-r1.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20190609-r1.ebuild
deleted file mode 100644
index ff8ae6d5c295..000000000000
--- a/sec-policy/selinux-flash/selinux-flash-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="flash"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for flash"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-fprintd/Manifest b/sec-policy/selinux-fprintd/Manifest
index fac5383a7422..4ac8eb6857ff 100644
--- a/sec-policy/selinux-fprintd/Manifest
+++ b/sec-policy/selinux-fprintd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-fprintd-2.20190609-r1.ebuild 373 BLAKE2B f2a3cc566ea3ec93c5ea8a7f1432715c02dd66e04082a77a85bac709541e92463b7d82e59d545a9c632f6d28c50e1c220badf38f283d7a3b41b97fd49d4b7869 SHA512 40a8ed7717d128ebde3a0f8324c5bcd0b96fa7030c3853bc89ca4ab6f392bdf683acfb1cade3ac458caf9cc58454e0244ad3bec2eed994bd8eb9a3f208477234
 EBUILD selinux-fprintd-2.20200818-r2.ebuild 373 BLAKE2B d67b4c5e79aaf26c0dff186a083b13b3e413dd543df984cdd7c211731fb34eabc2b6b7faeae20a4ccf272994b87fe3c432483eda907ee460b1f304293f0bd188 SHA512 985742a6de449b8b07b393f15a822303c71bbf1d3c992f728d12b19dc8e5a521d38976548a745c0c43aae5381e607905326f5eab5f8452df3afdd27c120dd0b1
 EBUILD selinux-fprintd-9999.ebuild 375 BLAKE2B 3880334598b73beb46d9fd7062b8d9a29d0e7493a5e64962c23d4b9c251a8fad1b31d291ed16aa2928c1ba50811075af8edff7cf74c7c1a243661a61e38009ff SHA512 dd20a90fcea2d196560192fb958476a8fcbdc7ce603576b08a3007630feddd75c3eaeb01d9823b9e48f2f171a24d7e09c003c4f634a17b6d0d4bf5d92b3fa3fe
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20190609-r1.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20190609-r1.ebuild
deleted file mode 100644
index 546d0e1ba794..000000000000
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fprintd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fprintd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-ftp/Manifest b/sec-policy/selinux-ftp/Manifest
index a141b436fc3c..dca33af4b990 100644
--- a/sec-policy/selinux-ftp/Manifest
+++ b/sec-policy/selinux-ftp/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-ftp-2.20190609-r1.ebuild 273 BLAKE2B 826b23798472f2efcfbe99266a38d7bb3edf45bc30a1a5c4bd5959c9e799e81b36bee4a7e69f4a2faf0dbc1c68a78212a9d9c28834d9a85f5b7371ddc5bc864f SHA512 910f4a77bfaa486ebf1fed76899c1f03e32f201f9ec661fe20db379aaca33095db198e8001bb1e0d82750c6de764ef3918d2203ac921249653631d728155cd50
 EBUILD selinux-ftp-2.20200818-r2.ebuild 273 BLAKE2B 664ddd6934fb0f5696939caa4987d27cb07e26d6c985c7ad14bed05ab8e22c3dd0c82c48dac8e841d06d7906520b4c6d71c6b0cfd13bcb1632070ec9009d88c8 SHA512 0f63c28cf0b13991c13fba3661432824637548def881ad5a99dfec5d34ac568e8838c82f03d6763e25ac6e7c3a3ea4a1aaa46d51bf6964737fe1d7f18e6176ec
 EBUILD selinux-ftp-9999.ebuild 275 BLAKE2B b2c39d6e70283e63a3b2accbf4c0dfbc4a6f14c532e3aefd52a8df202b96cf91222be035d3b62b690e18717c1d4f03f02171285995ae8f49e598aa50c963605c SHA512 37ea6dfc95376d18205b0303e11bbdf4eef6c6e0882ddacb25eed77c74d84d0fdd65f871bd25613773c2b0dca046d28976be5d259bf49292cf2c6451e9357caf
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20190609-r1.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20190609-r1.ebuild
deleted file mode 100644
index 60b89d957ce5..000000000000
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ftp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ftp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-games/Manifest b/sec-policy/selinux-games/Manifest
index 3570a798a26b..056f0c8ff761 100644
--- a/sec-policy/selinux-games/Manifest
+++ b/sec-policy/selinux-games/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-games-2.20190609-r1.ebuild 277 BLAKE2B 7906999affc93ad5fe27b79c10c47a0cfe52d59462129e2a43431e4ca136cdcc1a86f8ee89d796be022103de37e7322dbb11861aff18d7c7dbc2120fb96806cc SHA512 71eb1299bdcd58d596b8b1f502b3f97c8c1727793480664b6cddbc35551953ed4651e716595bd392ad4353bcfa6734131e1ad34c290a177a008f9ee35be84821
 EBUILD selinux-games-2.20200818-r2.ebuild 277 BLAKE2B a1f45cc1a30420dbb5aca602f927b77ed05391dae1920c6500d8639fbc4904803c67aa7cd522058624575adf8757b8740d376b5c2815e78b7d1361be58b34a62 SHA512 dd8bafb716fd73303ee2df0217a7fea287c96c816c0483e229d45a3749b191044ac101db4a97b63724f8792705fc1e24100f8fa80ffc5496d75224da9a90e606
 EBUILD selinux-games-9999.ebuild 279 BLAKE2B 6853b1010c82b6a0a9f89a4ebd68e3dfd4c8865a313a8669d4f8b8a14936fc59f46b7c9e7ee79c1dfc85ce83a20d612cbc68b1aae393e19a5674c7b117f61066 SHA512 e9f579eb3c3194eb9476e17a54b2fc11f9dcf2807fba0c6af79a3c23886de3b0da0c662602a3a124535f89164ca869684da925bda136cdb009c842490e2bbe6f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-games/selinux-games-2.20190609-r1.ebuild b/sec-policy/selinux-games/selinux-games-2.20190609-r1.ebuild
deleted file mode 100644
index 5b88b7d06130..000000000000
--- a/sec-policy/selinux-games/selinux-games-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="games"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for games"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gatekeeper/Manifest b/sec-policy/selinux-gatekeeper/Manifest
index 243fcef98187..206744ca67a7 100644
--- a/sec-policy/selinux-gatekeeper/Manifest
+++ b/sec-policy/selinux-gatekeeper/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-gatekeeper-2.20190609-r1.ebuild 287 BLAKE2B c70f817144df2e3e90948829f373a0921a20ff9154d495c1cdec4eebdd44391a654e4223098d66abb92d600d5e7498f6d5e33f9b58f443e91004904c24c92560 SHA512 db6b5481d8c4777a77c5e76d4d9e928211c8f2c236aa636d2b58020ed1ead5f00561b0140849f28ffb254d9dfaf3f54710e1c8ca4a7eae50906e3c803276ef79
 EBUILD selinux-gatekeeper-2.20200818-r2.ebuild 287 BLAKE2B 6dbbae60e95bcea30093b4d4700244c7daefb78be6779eebe365e1b8a2fe2da4cf8a7b5a2e5e60f53871ca75cc9444d9d090140f8afa06c80b02f1b9d7a2331e SHA512 58d1f2a8e849f0fa1b1bd9a5f463e65d56ac988af77089dfafe8a68013220a84467d975b450cf83c1622820164b473bb1e9e6569687833e0372ede18ab55939c
 EBUILD selinux-gatekeeper-9999.ebuild 289 BLAKE2B 5dcc93a32eaeed9594c0d0307226c666ab6f1eef0b0e015c1b8770e5680cedfd1aad8f02be96fd552566d70d995f7d285150f0dde3039f482a152f9a11dc89f9 SHA512 886e5b056c3a8b5e8feba76970f8c928765377f80e5d5c4fd5cf9bbc61542281a4e562e34326dbbdc7ecf4de19f83eeb7022160454727c8dc082b3d1bf94436d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20190609-r1.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20190609-r1.ebuild
deleted file mode 100644
index 8b5d1f279ad7..000000000000
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gatekeeper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gatekeeper"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-git/Manifest b/sec-policy/selinux-git/Manifest
index 2edce00d9d2d..6ab4064a0c2f 100644
--- a/sec-policy/selinux-git/Manifest
+++ b/sec-policy/selinux-git/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-git-2.20190609-r1.ebuild 369 BLAKE2B 524434e90ff83c64449ccf81ea4dc883ece5dea437a634cc85157558e289a3a797508591031b1d191acf3ec2380fd2eb457eff2420e0aa6ce13514778d0acc6f SHA512 1989357dc9416f20954653f1ab9ceb214711cb540c6f8001a6acb07fbbf473a566f410df9c826546014df7d13c66a7f839b1370d5483eeba20f699b742531668
 EBUILD selinux-git-2.20200818-r2.ebuild 369 BLAKE2B 7da532e3c96e46f3a060d75710cf18c622e64eeded4ad20e332a593f1ece3599074615ceb7886f53fff300514675f7df9450bb669e3310522547f2a37133a7c3 SHA512 f7af2d130e8669631c79dd14813d22b3134f99ad5391eceffa3b15768cb2723cdce324649bd063d5b8b5fd1b703122ace007dec79da41d5f03ef5534d7329d5e
 EBUILD selinux-git-9999.ebuild 371 BLAKE2B bf7af1252420416e175dc7a7b2b16d19fc16b3b6b675adbbdccac9019b708860bb3250297bddd2a82107e1582c89b968b9544e0960db5c44365e1df57050731b SHA512 4a21087d35057ff1e8f3b5e358ae1d08f14d4b9b65eec5d6da0e03881207cd91724dad6cc5a9e7e2a9e6c7f5ea14c4b4c1ff95b8ee9fb7de31b8c834f1d35dcd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-git/selinux-git-2.20190609-r1.ebuild b/sec-policy/selinux-git/selinux-git-2.20190609-r1.ebuild
deleted file mode 100644
index 49a24f6621c0..000000000000
--- a/sec-policy/selinux-git/selinux-git-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="git"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for git"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-gitosis/Manifest b/sec-policy/selinux-gitosis/Manifest
index 610129c22575..e576b9fdaba6 100644
--- a/sec-policy/selinux-gitosis/Manifest
+++ b/sec-policy/selinux-gitosis/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-gitosis-2.20190609-r1.ebuild 281 BLAKE2B 057decd4c858bbb378d875d8eab5448457e48b7c7d3118ced6e40038301c85e1440cbbbf38211e2f3a22a9d0a6e65de991f5bdc5e4a00cced56d8fc0aaa4f949 SHA512 6bd6d0a498b3505c1cc5ee22bf2fe0d86aa9e2f44287fc689ecb5658e88ac1b66026599379bfb7431af058d206e2daec9e7d14a84725091fe7829110be301dc4
 EBUILD selinux-gitosis-2.20200818-r2.ebuild 281 BLAKE2B 14772488ad558ed32f7c9099a1b5821188c9377095dbbfd0462b4d46cc75d1689c8f6e3e39cd2a7cf1a33617182c3a05e8d1e9690397ce62adf849bcdbd11f98 SHA512 50ecea1d34b2e0949d5ecb5fb543e2aef882f45470547e36cc299db3791ac1838474a0c0f6cb6cbfc10bbeb579d8604e382ed6745c8a7efb3c99dd7e50f13ce7
 EBUILD selinux-gitosis-9999.ebuild 283 BLAKE2B 53ced8f9cfabdef650099faf52e4d21466e8fb0c6e21778b9ed338cd079d14d417e41f0e0d64fa56f9279e094d0797dadcac4eb3cd9f70cefaa2dad63aabafb5 SHA512 0939e10d082d17e289993090c4665059461235beba401f7a620ae08eeca46b7adf22670b99427f4deb560c13e19a8830efd9455a32bb4c7130461adbf1418570
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20190609-r1.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20190609-r1.ebuild
deleted file mode 100644
index d4f730fe9c1e..000000000000
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gitosis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gitosis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gnome/Manifest b/sec-policy/selinux-gnome/Manifest
index 12ca32f43928..3dda5051a5b8 100644
--- a/sec-policy/selinux-gnome/Manifest
+++ b/sec-policy/selinux-gnome/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-gnome-2.20190609-r1.ebuild 277 BLAKE2B 7886bed92648c63171c5e6d2fa7a75934ec7ed7a1de235b347b8f9edc89850b7a6efa7440a6a466ee8c7cf33e69971067ccfa9cd7116e5d8d124545f215bb273 SHA512 ae60415fade2035f6b74690d51bc59dc72b8fcfe0b07a2271d6f07f21fb8da637776db5bece03a7c845065561bf1538e33eea208ecb9eddd38e0d668f7f5aba6
 EBUILD selinux-gnome-2.20200818-r2.ebuild 277 BLAKE2B 27cc74e1c8afdb45cfd356af8e72497a7291857e2c620d6056d9cebd0a6845ceca03391372fe14cae574695af42683ca238227e575dd61bcb2fe4ba775dabf73 SHA512 5bb1ac906b385978f3e690d0a8b71261f2c43cccca65b8e711f2927bb7b706d85b3165fd8ec8031a80b5b53152ab86078a964650d416a5c209f5c61274c29315
 EBUILD selinux-gnome-9999.ebuild 279 BLAKE2B b4edbc5fcce0068a7cd83478234afe00b8c9a5696b1292b7c1ad5af56b97264f3a929e410753f06353015ae97a8be3f63cb828515a741f75a65a3455ee96ef70 SHA512 e727a8868da1de82a4a03fef36131d6568008ee29025ffceee12d6d68d5b99d317c25f993b220d3c641ff117774fc3c9de170e8308c06763afa3411deebf08b8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20190609-r1.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20190609-r1.ebuild
deleted file mode 100644
index d454a15f284b..000000000000
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gnome"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gnome"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-googletalk/Manifest b/sec-policy/selinux-googletalk/Manifest
index fb76733abefc..f3c068d118e8 100644
--- a/sec-policy/selinux-googletalk/Manifest
+++ b/sec-policy/selinux-googletalk/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-googletalk-2.20190609-r1.ebuild 291 BLAKE2B 04be59ecdb1be83e5c365d0099dbfb719fc06054aa9bdc609ed4c34b24ff2e5bf4228000f43e8da166765135ab76f3511fd4d685eb7e161bcbb520bdd67e933b SHA512 e92a0f797bed9b05768d6598aacdd73bc023a2d729947a5790e27f61a879ea3735dafcd06ea07e9808b8cf65e7188c86f4841207ec8f727af467262980a69269
 EBUILD selinux-googletalk-2.20200818-r2.ebuild 291 BLAKE2B bd1fbd815572bf8b06d2a7edfa2560f926f51480f026cf3f743ef1cb6bcbe1d1f45174f73f9cfd11fbf317a7fc6516c063a6ab4c986404c97398407892486329 SHA512 1e145031c1abbb6b201652e693379999607eb369e2a5736c4db7290f4d1161dd5a86ffbc6fe075860c14a734bc356434b9c0f49dedacaf03ce6fa1682aa656fa
 EBUILD selinux-googletalk-9999.ebuild 293 BLAKE2B be045cb884fbe4d007ba3d970cfaaeb0134a0083f32e9143e4fbc3e146bee6300852e9320529511dc74d485202153b4ecb40b7a8945eaf7b6a885af69e3ba410 SHA512 da0daa41ea6159c03bb6afd0f73a18eb07736c5b734cc40343a562d0e977cd316aa67b432b27fa7fb60388b301f28dde530128ba241a96ab2ed1903f65eaa3b0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20190609-r1.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20190609-r1.ebuild
deleted file mode 100644
index c8ed29c56195..000000000000
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="googletalk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for googletalk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gorg/Manifest b/sec-policy/selinux-gorg/Manifest
index b665fb77b4da..c11a2f445367 100644
--- a/sec-policy/selinux-gorg/Manifest
+++ b/sec-policy/selinux-gorg/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-gorg-2.20190609-r1.ebuild 275 BLAKE2B 1a47374168c8a45998cbc32b163b7e1c9b0b8ba110c22cdbb5779413feaa6f69a9b32a3ed229ef183f3d1405899b9b0d522c97421df9b23256ddf5c71ad76ee4 SHA512 ca026bb6bc4e9bcb9ab927550fed30f0c05915a097fa0e1a35c9755770f0588db984be507e0d8ce4f4bb053cb0fa8f8c7f37cdfb7726ac28b6246f4ad3bbeeb7
 EBUILD selinux-gorg-2.20200818-r2.ebuild 275 BLAKE2B 6ae80b5efca52d6a1a59feebd36dbeb7e4465dee34b2327edcd42a7067259caad61fe755e5ad0884bde72feb42cd2f8268921d8400d25c2aa93a983bf8af7010 SHA512 7556b2603a029637958fc86e78c76a35171cfd594f90128522b8f547936c005a34fd14ca386bdbe4528bd6da24067cf13b7e8bb34aa29d4152b077dd72d5f446
 EBUILD selinux-gorg-9999.ebuild 277 BLAKE2B fede218c3b93cc8c8fcaef69687578152e9c51c611a277cc37c5fa0d11990bd8c55192e0cda4425456ed709fb3e01a86973e818bbbb353e66c73088d69cee808 SHA512 41cb9bc219aa639ad29a8ab80b7b7bed3f808671d4216e06939e4ec70679630221cc96a7af87eb7e47feb14f83503302ec25119678006257c420d247586e3128
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20190609-r1.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20190609-r1.ebuild
deleted file mode 100644
index 981390bfef56..000000000000
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gorg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gorg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpg/Manifest b/sec-policy/selinux-gpg/Manifest
index c44e0e6faa63..f14639a7a100 100644
--- a/sec-policy/selinux-gpg/Manifest
+++ b/sec-policy/selinux-gpg/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-gpg-2.20190609-r1.ebuild 372 BLAKE2B d0312cb72123770bb0d864418d00048b8d2e5cd3b900912872d39f35052c320dca941949c1b8b4d1d61d044e65499ac4ca4d286a83762ef151cc0a197b9d4391 SHA512 5195867c53a06a1f8077047b1bcb587c85efed7103fc12ea8cb724ada7c812182dc0cf1456cb847989d3c62834a48d0d5d5a113a1fc482336e98a6dae1b259b9
 EBUILD selinux-gpg-2.20200818-r2.ebuild 372 BLAKE2B 95bf8eeab73e9d157e5523192d52469cbf1401e44bf538886f545abf4bf86f0a564a9e7b3cb416c0db52b73e58e98bb463250e5566982030394d25005ac0edf7 SHA512 c255e78d1ce82f397800b9e4f41029fdfbf8cc9b504b2976d0853de9e990e38ca33ee8859fa8257e2e028246b64c334bd87e980948208e05b207f3863e87e7d1
 EBUILD selinux-gpg-9999.ebuild 374 BLAKE2B aa729b5fcfef9c83e0e35e7cbd5a99593af9639f29d84c3fadea7c844a14d80f53198535939f305c7ecbfb0d94ed74a00a1010803b0c9b904124729f6e132d6f SHA512 c96114bb0718ea7860a784e8034e13f7e67fa3913dfa1d47335c08d7dcdc169065387e16e2777067d3895bd50676dd55a2e0363f324083e473258427d52c99ab
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20190609-r1.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20190609-r1.ebuild
deleted file mode 100644
index 5cf174af34fd..000000000000
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-dirmngr
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dirmngr
-"
diff --git a/sec-policy/selinux-gpm/Manifest b/sec-policy/selinux-gpm/Manifest
index cdb2b11c3bba..06c5f422ec06 100644
--- a/sec-policy/selinux-gpm/Manifest
+++ b/sec-policy/selinux-gpm/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-gpm-2.20190609-r1.ebuild 273 BLAKE2B 338f9cfc3837d08458325f9ff421b27f8a4a42a6c858307931ce9a80353cb82c3d014ec2ce70e02c5faf52f26fbdc1a28b9637fb735f4bd421a33411c5135042 SHA512 a1e689564dc7b660e9a371f22d28207bbc29b4d9c6e60d74dd0564cc2a6ff982e2e77e53265b50ec87c0f8b6ba53e60b6d3cb15a22b524e808c664cfcfd08a8f
 EBUILD selinux-gpm-2.20200818-r2.ebuild 273 BLAKE2B 3aa4bf00e090cb9550659585f4c8ef2e3d44a97994f6863559370c89c62b1c6c83d5e01f36e181201cda274c7082b6b55032f659ac870449a0fd24df079daedd SHA512 ebb9f152fb521c40b0d2a4397dc70ee8547cf0b3ed7739880b24cc4d52ae0a03790daf4d7ad221a48228bbd707c49861d58a61d1720f28568312862e117f7508
 EBUILD selinux-gpm-9999.ebuild 275 BLAKE2B 1caadfee9a0d5bb0340a2fe264ac19fb5f7b7125184d04d7a8b7b1824b51a2f30144be52dc174e9fad0c893e6f7484fee8b4ac7eab05ab69a8bc7f379ec3e341 SHA512 aa0885f04ca0d2f75e3f1191f6f29bc85b4c63c97fa97ac41823b2f920fee48f1b6edb04715aa90b9c1037ee546a869d7b612abd3222fea168f2c13c00757787
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20190609-r1.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20190609-r1.ebuild
deleted file mode 100644
index c31facbd46fc..000000000000
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpsd/Manifest b/sec-policy/selinux-gpsd/Manifest
index 30c14886b201..1eef26d0baa7 100644
--- a/sec-policy/selinux-gpsd/Manifest
+++ b/sec-policy/selinux-gpsd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-gpsd-2.20190609-r1.ebuild 275 BLAKE2B 7a5c57b700ae04c4bb85103a976b2e5c3b240e3315bb91e9be6d34ae9cf134664b371fd66b5553f554b840915409b14237ad1e722e9b70c3f972d45a03c39856 SHA512 0fc92187b92f58e05575d766f0da2a35ce37b0b165611fe80a338b52a716714aa5213704f7cd2ce8f3742209165d8dc5b6954af5f0d819568171242cdd8033fb
 EBUILD selinux-gpsd-2.20200818-r2.ebuild 275 BLAKE2B 59f1b8c6f3462b57f257e781e803208b1995101490ee592b17268cba175c1eeaefd27dd217e40c363ca284ac1f6e39f2564f72eacc9c7095db561290bfa7b133 SHA512 7044d200a1e115cb11b86afef7e371093eb4e0d604ecaba00042f00da29b263c5eb2ff58fe9cdbf5e4c87b6700e1c3187920d711f6b0fc1e8259a29ea1a1b44d
 EBUILD selinux-gpsd-9999.ebuild 277 BLAKE2B f8d27b1bd8e121e580a662d7d92f19ccf8c31bca2a0076fa0178c7705f1a3355fdcdf96747af3796b53d0996b23dce828dcf44d67fb7f81141f8d0c34bae98b0 SHA512 9d55f8fb6b4f3bb29f1f5f3f5c525d9a11b577a840d9e12fe630124ec4bc3656736bea246deec294b33f43a47a1f600824fa394664f5b3f9d0d410211e264cde
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20190609-r1.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20190609-r1.ebuild
deleted file mode 100644
index c35a34440ef7..000000000000
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gssproxy/Manifest b/sec-policy/selinux-gssproxy/Manifest
index a7271faa031e..f33932f0240f 100644
--- a/sec-policy/selinux-gssproxy/Manifest
+++ b/sec-policy/selinux-gssproxy/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-gssproxy-2.20190609-r1.ebuild 283 BLAKE2B e6ddb0546236ada8a9ed49710bc5260895741953b0715d473f0671921c33f1e533af31aa65603efa090ca5008408cbb01b51465ebb3d8a5c4991c21d348e916c SHA512 3c5dc03935df9d277ead996185ca780a6297f9c940881ea678cb017f4ba67ee2b2b129b0a68dcf6a4309e26e9ab1e3ef1a9fee40388a1656ee2301151ec6bae8
 EBUILD selinux-gssproxy-2.20200818-r2.ebuild 283 BLAKE2B dd94ae39f4e9e117ad864d097299bd13d7fdd6c34209b9718c1c4e91bec91fe23d8a6e4835d0f836b9eb10ca87758c07f3ef22712dd729d27ad315ff2743ef9c SHA512 787caba48d173335018b094efd46d3ba17daaf55dace27c94d6ecc2f875b6a9939d96d5f4ab7085c5874d51ca7301e05bdc5190b38aecc5f58043f4fc9ed2626
 EBUILD selinux-gssproxy-9999.ebuild 285 BLAKE2B 669622fb89f3922cdb5935f29ee90d4583d42584b58dd86a4f21b31ecbb652ec2b00fb27e1c6f483e4634b0e065275e83347c45dd24adb4baa441fb0c8ccc331 SHA512 1c4df54892022d51385689eab8ece46671c43ab608a1667ad0323a502a78c7c528b0cec68077cd3b548af16e6d756982931282c0342b919ad50e2b8ca0e337af
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20190609-r1.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20190609-r1.ebuild
deleted file mode 100644
index 5e04a763492d..000000000000
--- a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gssproxy"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gssproxy"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-hddtemp/Manifest b/sec-policy/selinux-hddtemp/Manifest
index ec0111c3ee71..174019a6b4bc 100644
--- a/sec-policy/selinux-hddtemp/Manifest
+++ b/sec-policy/selinux-hddtemp/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-hddtemp-2.20190609-r1.ebuild 281 BLAKE2B a8d481dd3dfbc365f485b2019b62574184b914f1672e2c76a7a085a75074ee62a45bb1bc0d134ae41c2fd955fb095df558525fe93b8528d8d19ff429ae416271 SHA512 5dc9b72547cf47c8d5c2b7f1ecdfcafd3097a07954d103fc2f7a79901b93979c0d65786b44b387ef9607c2cd91413b8018a647e85e9d1b5e21f95d013d3736eb
 EBUILD selinux-hddtemp-2.20200818-r2.ebuild 281 BLAKE2B bb718bee7ab9eb495066aeca5ad3b9aea9c0f2b807272a9a140d4d7287f0852be4e2a087824c6266b91dd5144bca6b893f5427032464d50192fe5eb1feb1133c SHA512 3f4335852ad4ad8797978d18a00e74f17cb57ace7d6f7c15d7a6a1b21b575493cec95da68b774744ffec4f335eca6ff9e663f2ea0ad4b18bff822a04974ea049
 EBUILD selinux-hddtemp-9999.ebuild 283 BLAKE2B 307d0d4b1871f968d08eae1cd7df7c66974ef27a1108d05b09c2c30959cabd3049af598481c19d921e7da3033766c6b0ff825a45d629e9f2ede807e3db2a064a SHA512 0893a590a6d5bf524213d2714761eb4eff05acdfafc90a70844b11c4c0b6c4b1e928bb00c233725ad6d2281f1b355440d0d6e5951dfdd397df4f5e2dba07944e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20190609-r1.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20190609-r1.ebuild
deleted file mode 100644
index b677c4b786b0..000000000000
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="hddtemp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for hddtemp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-howl/Manifest b/sec-policy/selinux-howl/Manifest
index d9b1d3c7708c..b9f560ed4d56 100644
--- a/sec-policy/selinux-howl/Manifest
+++ b/sec-policy/selinux-howl/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-howl-2.20190609-r1.ebuild 275 BLAKE2B b51b0e281eed5865c99cca3147b187986715cb11c5c3aeaf6d2a33301476e0d852949b753892eb1a5a01b57907cdd439c20b1ab24d8e9daf1272146b30bb846b SHA512 3a426bcb86ba48bceda2d1c9a52fbd13fff946ada7a4e4b7aed0db67a9f9cbef0a9cc2efccce40b6c301e68bc154acd04d6626313176b20e9b0b408bac7ef04d
 EBUILD selinux-howl-2.20200818-r2.ebuild 275 BLAKE2B 06add2ada7f82aa7d5b8f16dc9c192b70b9282cceb770d76e6f5257af1e38e664000d6af09e643bd8242a6f728d73c8c83b992b050f6826a29e030d05c98606a SHA512 3847073a0d5f7d099f415537ff9a2cf5946c3d3e3289ead1be9bfcc0035e23a1e6d3ec85a5f4a6cd86217e408cca137a191be9cf1fd2a685d3a173d7a0b31b1f
 EBUILD selinux-howl-9999.ebuild 277 BLAKE2B 3c61fb29455e41b641b6d96e66dc12c85bd043cc132eae6a3b97bc7b99cdf958c4814bfa9fef6457fadecd9eb4d8e4f9970d8906aa69266e2db3b877a47cfff0 SHA512 04c17bbe2c04c29387159ccd830511c4fc530d09aacaaf29c3bd58df19642253b768dfd0eabad298ac2aaef112d0f625983ad214786e664cee2070b0d93b6699
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20190609-r1.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20190609-r1.ebuild
deleted file mode 100644
index ac0fe42b2cca..000000000000
--- a/sec-policy/selinux-howl/selinux-howl-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="howl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for howl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-icecast/Manifest b/sec-policy/selinux-icecast/Manifest
index e1af0c37de94..ac0985d028b0 100644
--- a/sec-policy/selinux-icecast/Manifest
+++ b/sec-policy/selinux-icecast/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-icecast-2.20190609-r1.ebuild 281 BLAKE2B e9d6d793cde170b088756472e7ed2c756fbb6fe5746c07912dab5713df22ab36627801c386eba994b50a166706c1959ebd71c610b5cad590483037e980b2ff57 SHA512 c62cd484aefa2259a32f7442d7aaf4b62415086cfd60e25f901ae44f17791d0d7aca9d9e95918d2d496342ef0c68a13a938939e2daf32554cc5505365cc48874
 EBUILD selinux-icecast-2.20200818-r2.ebuild 281 BLAKE2B b86af76842212d7ea20abbb3d283171fcb2ac804508d69363212ee51184a14c2ec894633ba665c3f9d601abd4dca95a0a25e7b5563885db7d862f2caaaee2d72 SHA512 331f90149c305c29d4dedca1fbaa5236a88d4fffb833a2611ff07027441afe690ea3db5ae4456b9232cbec577f884b384ba486be96169ffe8314fe0509aaa329
 EBUILD selinux-icecast-9999.ebuild 283 BLAKE2B 3f01a03da9f8715ea8376eb503fb1514d2fbf8752fda151574de177400ef86dbdfdb188db1648602b483aed93b39073e4504f6b4d865d7b16f2bae3bf0f9b4c2 SHA512 c5b4c015b6be7176b978f72c4f461c563d37a32ecadda81da78f6320b71eb0834ece52651e42e8df97e55dae9f791d46f9d9b0a5e89df9bfaa1100a92f9b45fc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20190609-r1.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20190609-r1.ebuild
deleted file mode 100644
index e1c6d82781bc..000000000000
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="icecast"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for icecast"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ifplugd/Manifest b/sec-policy/selinux-ifplugd/Manifest
index 122ebc6c8bc9..be4eeb582126 100644
--- a/sec-policy/selinux-ifplugd/Manifest
+++ b/sec-policy/selinux-ifplugd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-ifplugd-2.20190609-r1.ebuild 281 BLAKE2B 28cf75e3ccea660a3c4f9886408705cd12863b09d858ca29f1eb5590ce77fcd5d900d9ec02bfd5614d61ad142ca55df57a2a592cf65bc03650e411465ec74ed3 SHA512 55c43b2a8e17d04619857fdf76085b6e05063fe93c9a7c826e123bef02899bfe2ad2a3165068648d89df93b779c3b2b4791c8211a39ab7c37eefa96fb5acbc9c
 EBUILD selinux-ifplugd-2.20200818-r2.ebuild 281 BLAKE2B 1b4bb5ba9a86bdcdc157d80d782883813501d6dbb0dd8e9888164c6500d16032599d8b41fb091fb3be32bfd3088d1feb195456211492769bc177a815d657db89 SHA512 b8b4dc74c84ac32a80c9dd21dff249d02590df6b92b410d1ea051c705e89b7fb46f7dc0ac419bd0e674e24dcb25fc78e19fbbbd57cd2740276f4d66ba33b2f5b
 EBUILD selinux-ifplugd-9999.ebuild 283 BLAKE2B c09c33b1855ce14ebb213d968674bc6f5fbf04be411ba0da49dd8f86feb02371b7fe5de9c169567cd2185ce7e5cf0e59530e10847c9b49f79f35cd17a366f035 SHA512 59bbbd4475d016fb6992950af4e3645efdfb2ab8e03989793d15b47c68b1670c322971f54ec8cf0dd565fcff43384c7546532948609b3821d53d4255f0d6ea97
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20190609-r1.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20190609-r1.ebuild
deleted file mode 100644
index 3190e65561e0..000000000000
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ifplugd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ifplugd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-imaze/Manifest b/sec-policy/selinux-imaze/Manifest
index b40c319741c8..4fa407da0ead 100644
--- a/sec-policy/selinux-imaze/Manifest
+++ b/sec-policy/selinux-imaze/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-imaze-2.20190609-r1.ebuild 277 BLAKE2B 7dc82ed9d231fb6f5afb19dfa77c051719729809121f752176c814634b9f138d56081c1043222b34ab6034e6a43bb94fb293435821de2faf33d4c87eb93a273d SHA512 f0fa13de0b73d546b8facb83cffac195eef84e9de9b2544b86dfec3afdb44b869a64e16d9fc2ca8ce7f97de15218f4e1de8955a88d4a88942d6a35a7c4cdefb5
 EBUILD selinux-imaze-2.20200818-r2.ebuild 277 BLAKE2B bbfe29f2a1505003b20bfc644e6d37bfafd5f2e87ac22b53620128f70eb19d876a4a77053bcd0b3d36fe206fede54f80626d3b9b6c2587e7c2a36d9b52cb1c47 SHA512 b8f603a0595420a3d38880f0f8a59946e02b2e6f50283a4677d73bb2847b4e16d0ddef91ccc056241c76b8e9613785f2add39bc62d8987ee72b56e71d6444b35
 EBUILD selinux-imaze-9999.ebuild 279 BLAKE2B f4162a94d6fe437ce7939b5fb8a8da2270cdadfaeb41de430cf5bb4e07aed2614b5ecd7d5d39cc5b9baf743f2cd8617474c827e8db4046194eb7246289831a57 SHA512 e17ab983062152aaf952bfe5f1bfdba576a50b9b9a55f7a1bd7c816945883a1f835bd1dfea161203db206ded343b0a596af882a480813cc5e6051ea152978116
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20190609-r1.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20190609-r1.ebuild
deleted file mode 100644
index 489648ba6142..000000000000
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="imaze"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for imaze"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-inetd/Manifest b/sec-policy/selinux-inetd/Manifest
index f06e416742d9..ed763e065bda 100644
--- a/sec-policy/selinux-inetd/Manifest
+++ b/sec-policy/selinux-inetd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-inetd-2.20190609-r1.ebuild 277 BLAKE2B c3a2adc0b3a054b2a248d8c7156ad615c033d1f4b7264cec586e98bd0a720e2038b036e006e34d6e622bf1368281a329c47246b8dd9c877387dfbdb1f734b7b1 SHA512 f4bb5849085748d632257dc52ca1d5d760c8d4b5c6d271cd363f50ce7fd54394fd18bcb90e668218ab952f5a601979fa802ae18cb72dd0c9c601df900385a64c
 EBUILD selinux-inetd-2.20200818-r2.ebuild 277 BLAKE2B ebab356e28650f19791436ea1874b1fd608580986741cb8ad13a08b991bf8494748c762e3f8c996862ca7fb3f9f7b3de0badd78c665b8c239e4299103fd0bb0b SHA512 5922949f0415342a3f55eb7d56684a49f44806d647ed888bf1cc5c642f18848aa31dea3a7ff1339591e847951291ae3932a063b33f6b8e2e5d4acb714809eeb0
 EBUILD selinux-inetd-9999.ebuild 279 BLAKE2B 0f9e566a647902796ae0576222cc880832d62351725aa4b94a9c7860a05ba884e68371810ccb2fb0e70bd840a7377f0278181d6551194f99b96c10e4d9bbe4c6 SHA512 a51d8075640ebfda9d00616ef06acf98f3367cc12f692a1c9ae21f830cc42c05138bb3a7160062792746c9adcc40ee3cda5165e7d0540fefae1801f57554ff7f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20190609-r1.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20190609-r1.ebuild
deleted file mode 100644
index fede958e81a4..000000000000
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="inetd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inetd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-inn/Manifest b/sec-policy/selinux-inn/Manifest
index 1c958ac97695..20c0b9494d5a 100644
--- a/sec-policy/selinux-inn/Manifest
+++ b/sec-policy/selinux-inn/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-inn-2.20190609-r1.ebuild 273 BLAKE2B 672797b7bee8c32b506e039641430ab6a8cd82453528ce848ebe198a28b4179c468b7fd313e973c2fe7f677ccc9f483228c21d284335945e96769af260a7fd5d SHA512 bcc21b2416e6e5a8856253eca82b7b64ac79b1f9af4ad66c1c015d0d4aab59d67efb314842b5ecf6b7cf4c4440944959e7c36dafa593b4d59fb639bbec08ff4c
 EBUILD selinux-inn-2.20200818-r2.ebuild 273 BLAKE2B 389803d9241d6b486d4d6aee182f5bdcba062dd2e8063fe157fa0bd8a7df0356d383ce647805dbd361c14b4633a67669d3b2471e2a0c20dae8334db64d8b856f SHA512 fd5d38e4fd693acf2277b02c4bf7322fe8705eb8c1f915a703950d3fbfdcb2b50f18599a646e4ccd241b29d1762769cf76d35b399184f6da41c12d36ad2b6e19
 EBUILD selinux-inn-9999.ebuild 275 BLAKE2B 078982a6130bdd1c2b647dd6963aafbc97443fd56e4741fee557fba71d325d2a05d337e446fdf725bb6779d0c156ebf58174d9b055457eab3d8321e0a8b6847a SHA512 f8348b26498d5354eff906b415c0353cffd6fc57da4f01720e45b93e75a1516c83d39789186d7d93f7253da19aadfec00231dc44a4f93f0f0587415be72c1f76
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20190609-r1.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20190609-r1.ebuild
deleted file mode 100644
index c6c4d8b76174..000000000000
--- a/sec-policy/selinux-inn/selinux-inn-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="inn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ipsec/Manifest b/sec-policy/selinux-ipsec/Manifest
index b5b514eb2fad..3719714c4f68 100644
--- a/sec-policy/selinux-ipsec/Manifest
+++ b/sec-policy/selinux-ipsec/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-ipsec-2.20190609-r1.ebuild 277 BLAKE2B d948c18dc4e3f96307c79918ca3cff77317087120a703a2440b5c457506880e76a51bfb33b25b08c4d86c7edeee9116fb8b58f8017669ac3e1f282bea034ac3e SHA512 36fe0a15e27ab22b1ea410e8eae5e46137b4a145a70e500cd798706dbdd08cf88f80522754866267c778b352f861258a6518e2f6a0c38f9076e5f1fbcd9aa5e1
 EBUILD selinux-ipsec-2.20200818-r2.ebuild 277 BLAKE2B 2e07217ac1d32f168cd51ed102bbbacd993b2be65f4c9f50bf1e5228e99bad6dcdfc3cbd0ed16efa576694ff63a7a07fec3f8b06fa566671f051ec7390a59228 SHA512 8b44090b7e160db83d66e5b10fd65aae7bf8a67c244e847a2b97f69fbf9319ed14edf56789a941b92fc8cd868397e2572b1fa0866126aa7eb4670a611b74b912
 EBUILD selinux-ipsec-9999.ebuild 279 BLAKE2B 2dfc3d1a3b4b0ece6756590c2feaf05344c2b823769b85938d1502ed031ed3f8a3c3be5bb42761cd4eb794e2bda78c7d14162db9c072d4bfbaf2a795e0f4268f SHA512 da296353bba89d675879b99fe2c8612695e8874a0ce125768a3bdb936a352efd069dc3dd5e6cb6c7de307bea63da4f3e1bc0e1a554d63d80e83c3377a2abde4f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20190609-r1.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20190609-r1.ebuild
deleted file mode 100644
index 5c90d6ed4a0c..000000000000
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ipsec"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ipsec"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-irc/Manifest b/sec-policy/selinux-irc/Manifest
index 273fdeade976..98b9d1427a7e 100644
--- a/sec-policy/selinux-irc/Manifest
+++ b/sec-policy/selinux-irc/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-irc-2.20190609-r1.ebuild 273 BLAKE2B d823b81194dde4bf21666381d9b978bb666489eb07b197d364d28186b0533cb29f1fefe3a3fbebb542d2f7c685efaee580d8d4f2765227dce9033d3b023126c3 SHA512 4e1642e2fbf414dbd6a387ad3d8e0fac73a2b7da91c2e53e15f4e9f14ed6ff5cc7f290e40995dcba110cfc0c1d114a50aee1bf44c38df9aec1eb14da6f15e9de
 EBUILD selinux-irc-2.20200818-r2.ebuild 273 BLAKE2B f3d6ca0541d8aa96ad93761f0c383f60088c87d96f04f939e484dda16aacc97ec24f02c13d28a34c9e5c6a846c294807aa895354c15464bc507b105f3ce3f0de SHA512 b22b8c514cd71b9f5384d4842cb94198b0919ece5bc07e91fef8b5e641501f8bf7abe8941cb6df7e39b16bb8497107f73a0cb97034c583074eab031c5ca66231
 EBUILD selinux-irc-9999.ebuild 275 BLAKE2B 004afa2027d0917eb7116fb0376ab5feb838c9145dd3aac89a18e5800164a0a624dd859e1ef001d10ce85f5ad2a029992566f8aa03d6b29b7e54a4dff2e893ab SHA512 a5ff68783bbbaf0c520044ae53ea4cdde58e7c4d61d239f64f2f2297151a2e7d1a1ecf31d6d084dc06fe6fd2011a3f829824d4177b378c5f4131c80ce1acdec4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20190609-r1.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20190609-r1.ebuild
deleted file mode 100644
index b5c726276812..000000000000
--- a/sec-policy/selinux-irc/selinux-irc-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="irc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for irc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ircd/Manifest b/sec-policy/selinux-ircd/Manifest
index 84f20ca3e211..862042ea83e7 100644
--- a/sec-policy/selinux-ircd/Manifest
+++ b/sec-policy/selinux-ircd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-ircd-2.20190609-r1.ebuild 275 BLAKE2B f335e64c99275fef0725c372b4e90350ab8bdb2bfa52fe30a72e2f4d3c807338837d77a470e904311cda56ec8808e6252ee8a06391f227dce10c5697828d08db SHA512 5a1fc8777494f4fcb021c1e0ff844175c9068d1409dd94adf87620e44f6c8a832a637aa75164cf20aa554f3d386aac0233dd5a07b4eb405148e214a9c0279e44
 EBUILD selinux-ircd-2.20200818-r2.ebuild 275 BLAKE2B 758dd9053b89cdda1fefed05b6b3eb091e2c392d3ea3791db6e4c5ab0aabe0ec4aae4d0960a281421971a13c8f7794ba822442327b17e656930439c0160cd2bf SHA512 04cd17dd5c71ea25d7150573e0af48a30240300d48d87dd770dfd5c69272ab1adfbc699c87db0262eb392473867e5013f698565f87c9fcd154253b722594e2b6
 EBUILD selinux-ircd-9999.ebuild 277 BLAKE2B 9e3a0ad19cf6e73b1f17ddc1ae7e2512a98ba22b985e8562d59ff017439ca857ce54d1b4b306e4842d3e127dcf12a0a8b4061560df3bb0af8a5d3e8fcdf08dde SHA512 def9e90a5298f360f96113ebfb54f1d554ebf03daf02ea97f3b4095a0a60bc662d83736b7f2eb6f2080d44bb0dcb8d23aee1ce8fc86e86d6ed7d9d5971f32edc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20190609-r1.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20190609-r1.ebuild
deleted file mode 100644
index 99d5126c869e..000000000000
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ircd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-irqbalance/Manifest b/sec-policy/selinux-irqbalance/Manifest
index 588edd34d663..57e71286a0ae 100644
--- a/sec-policy/selinux-irqbalance/Manifest
+++ b/sec-policy/selinux-irqbalance/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-irqbalance-2.20190609-r1.ebuild 287 BLAKE2B 2061d8cc8531660e9dbcc294820fc76c02151c75ce35c889a3d1f06b0c3b631e534030cb75a9ef6ad14caf1580f5cc2c6673ca8c03aef7dd95b2806d169023b2 SHA512 fc27980a7a4157e08883128bec5c30509be50baf88695bae994bdd10f3b3f55f6ed724630ee473762a651a43b1bffccfe6b48d66176b0f3e86699e368a71ffde
 EBUILD selinux-irqbalance-2.20200818-r2.ebuild 287 BLAKE2B 039144ddf921d120a8e61d2c724897d9935662d0798a7307a531fd0d19e488f2e33e0f77101c60e69aaa30adfaef3e39d5c08ea7b7a98756d97c5244095f8aa9 SHA512 4aa315a552b89842dd0b606bcd646eac2f8f071e0524be296445b0afc6d4090455c6713e7d7d6bb66a2e02e87ccd9bfa908d29336a13f6356ea9ff01fa89abcd
 EBUILD selinux-irqbalance-9999.ebuild 289 BLAKE2B dd917b1a30945ed0205f25d1ba16c29474533b7c834d9e51227b93314500abec53b688033bf28905f0c57417eea96d407e084035698fed4e98653b8bb8d42df5 SHA512 1c751b44c171e0b35ed73b9885a16ee9d0e90c2d6496c6cb64c39c7cdd59e1eea6cb6f9800c92ec87634025af30d50ca59646f6a430c054391eb298283902c5c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20190609-r1.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20190609-r1.ebuild
deleted file mode 100644
index aea0de17ee95..000000000000
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="irqbalance"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for irqbalance"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-jabber/Manifest b/sec-policy/selinux-jabber/Manifest
index 159e20fbcf15..c12b42d78179 100644
--- a/sec-policy/selinux-jabber/Manifest
+++ b/sec-policy/selinux-jabber/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-jabber-2.20190609-r1.ebuild 279 BLAKE2B c6e0525d49b951a2656cbfd5301db8762198c4fdd67cc1cb413538085c40f7def7c1d23a2f3da6c51effac4531de12286712e1fd359a297be5711b07cfa8b441 SHA512 f2c228cf03aa9a2601783e9eb459ed8d966250d6e004f25e846477598e3cb286a422535916a6c1a98b3776a2266cd7c8ba8c7aad5f0e8db54528a493bedb09d1
 EBUILD selinux-jabber-2.20200818-r2.ebuild 279 BLAKE2B c91cd479e000ddaf14fc921a5529ca4e16dff1573a241c5146304c807fe13aff7359f3e5cd659b755f588ada34fe36790eac2986e6a6c93bf2bfb9be477c9635 SHA512 9c27a619bc04288a22fc9263680cdcb421bd4ee5c81ce7ff050931d112ddefe3ee3929932e9f9c40e5d89148ab7f962e9bf4d37b129cc6b7c644fc2806961108
 EBUILD selinux-jabber-9999.ebuild 281 BLAKE2B 6e4375209b13e5c9f02fe722728448c8572464b51f468e66b980dda5ae5c7f70c7dd4dcde622dbcddca7f0cda9771485e2c0927086128fb7e689e75aa3853615 SHA512 c5be7be7b40833def32faadcec45cf6b4f0d9fec61b59ba170b5e7f28e5e9c08dc356e224f6819521e35a67b4bf2c91cee11b8ffe2014ca34a5b344b6cbb10ed
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20190609-r1.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20190609-r1.ebuild
deleted file mode 100644
index 9c20766a44a8..000000000000
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="jabber"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for jabber"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-java/Manifest b/sec-policy/selinux-java/Manifest
index 8e32e351cd45..bef14465d34c 100644
--- a/sec-policy/selinux-java/Manifest
+++ b/sec-policy/selinux-java/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-java-2.20190609-r1.ebuild 279 BLAKE2B d5abd5ffaf6e356992b0c6ddc6f2a34bca28d0eb8cff3e68a6268ce1ec578720fb6eae4239476cf01917ee33d5ad56ef9fafc1d39587da44c51d45b597f6d29c SHA512 f36794a527521ff0e87c306a1f2df071e9bd5acc29904ea4d7bb5e0f63daac38b8956a4d51be2d3010a1fe72c2f63d5312f0864ef806f9649e9aaf2a71ed18b7
 EBUILD selinux-java-2.20200818-r2.ebuild 279 BLAKE2B 2a53362e0f3fe12947d816ed593377563b71c8a98ffa0257489ebfb9386de09515c3d997145d7eea8e85d94ad67eac7c1d851bc4cc942e7e7c31e2fd56985538 SHA512 c79aee6fd545e151045049535d780ef879ed652e192c5e9d480d62d75809dc0af065c43b593b0ac71859ad48c2d3d7ca0c0fa72cc782940b6e4852bc6cc56939
 EBUILD selinux-java-9999.ebuild 281 BLAKE2B 654c0ed6bf672846e12c717b35bad398fa488a4b4ede857326e3674c1fb4a3632e6390b84ce462ca9dc7c285687f0d235c2d5547dbfa3a9df01ab72a14dd9d5c SHA512 2ec611abbcaaf9ec98e4153254e3d827df702f9b3dcd6c6673090b27c8644f5d34307a195e1874dc8726bab26a501e3066ac77e5949e479263b6b4ddceae07cb
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-java/selinux-java-2.20190609-r1.ebuild b/sec-policy/selinux-java/selinux-java-2.20190609-r1.ebuild
deleted file mode 100644
index 8da3069cde43..000000000000
--- a/sec-policy/selinux-java/selinux-java-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="java"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for java"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kdeconnect/Manifest b/sec-policy/selinux-kdeconnect/Manifest
index 7b7cb97bc4cc..2c389a8b954a 100644
--- a/sec-policy/selinux-kdeconnect/Manifest
+++ b/sec-policy/selinux-kdeconnect/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-kdeconnect-2.20190609-r1.ebuild 287 BLAKE2B 494e52a8c88cd0769d9b6845dbbaac569fca2adc0218e707284431ab9ef1e789a8256178fe6403b6bb0026da53381526590418e9b7dbffb8aabfa4b3f9d590e3 SHA512 2afca4cb4603c09ef54053c2b6a0eaa1afcb9ecf7d31fb8363d35e993bb43afdeb5cc289c0bc3096b2bb28790bc013e0bf163b9f5571c3d785ddd4d85dc6885c
 EBUILD selinux-kdeconnect-2.20200818-r2.ebuild 287 BLAKE2B 7db24e516fc01c46c1734fc8e256a74be93872023f471290bef8e204f0d1ec104528f6e72fc44aca30a36c066ae61fa7ced90b56d8a48cceff39009f29ab5dc2 SHA512 1146cdf2d3de3eb4005c997d17c54aa037c45e405e8e8639b0c0080a194f3cc4bc91d95a941c16f64b99b1071f1542d7068e31174dcb4d12e9bf09f6c3f85064
 EBUILD selinux-kdeconnect-9999.ebuild 289 BLAKE2B 566b8315f9b4a9fa04e5a709c919c28826e9ed9833ef870ee88525c496fad21910753f9f7f5a5421c769b9c6bf3802e5fe6ad3b278fbf3fa86a826e98cfaef54 SHA512 f6af8e1402ce1ffa641de6416afb1392a39d2d6b54169972be2ceeb30053db2eb6b5fcf5606312196d70f17a09b9bf597b9c026be552f5c163082950987d0f99
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20190609-r1.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20190609-r1.ebuild
deleted file mode 100644
index c084accb0899..000000000000
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kdeconnect"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kdeconnect"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kdump/Manifest b/sec-policy/selinux-kdump/Manifest
index 3c0d6c2b2058..ad1c4fa2850a 100644
--- a/sec-policy/selinux-kdump/Manifest
+++ b/sec-policy/selinux-kdump/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-kdump-2.20190609-r1.ebuild 277 BLAKE2B 1839e1ef13d8f29e0cce4f7c9fe01428e270eebcd9680d4d6c55328abf04447da8924fea2bdcf4a6f732a6c36364dbf9c0f879f0118ced229e772d0f4f3c699f SHA512 7f98f47588705e7774d444db88894513f19d7c1db2348d321759000e172afe6a05e23ef9b8947d6cc086f56d7083aea78bcadd3e04708b4e1b1716a5210412a8
 EBUILD selinux-kdump-2.20200818-r2.ebuild 277 BLAKE2B 3b7e75c099eb2c2ec4b7ec61058dde996bc9a3694a2c3da27199be901fc41ed077a8d1f59a67416cbb055abf66d86472dd2c67632948885c4b8b77a86ebc7935 SHA512 1685beae8d46ec8de2febfcb67cb1e40f46e24542ce669524d65badc7b5f04c6f7bc9926601a2d059891f5942e385238c87aba52edbe7877ec792749bedf777b
 EBUILD selinux-kdump-9999.ebuild 279 BLAKE2B f3ccd6030d93c49f08c8118ce0f9be56535a3061fe02d51f21df996f494c36e61447dfdf0c4f9da184145df7ae9ad32413f7fb8043193022a2222797a22910fb SHA512 c92ee2af4f11a97c0041a2449f2c9d4b92f273c1a932cabc8333c7a0d4eae17250eb7c5f5b9344e17b8a99228604ff99c9890f6ae75d3491d1488087d4244aae
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20190609-r1.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20190609-r1.ebuild
deleted file mode 100644
index 3cd1801830b8..000000000000
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kdump"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kdump"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kerberos/Manifest b/sec-policy/selinux-kerberos/Manifest
index 602d83f334cb..bff1955d48ab 100644
--- a/sec-policy/selinux-kerberos/Manifest
+++ b/sec-policy/selinux-kerberos/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-kerberos-2.20190609-r1.ebuild 283 BLAKE2B 4f4fdde5fc20001c2e4580818f39b34bb0b79cae676b07599d8cf256dcba00b4cedbc28ba02afcd7f42ea9e5766e0902bd0500549d30da6aa9389a3439c98a5f SHA512 fd57613f65ca50aa97c409da86b15112935ff6fc185b96184a3e40af0482f15d895448545b91f0171de4640d5f361405edfce0c34019090ed84a5e77882faf78
 EBUILD selinux-kerberos-2.20200818-r2.ebuild 283 BLAKE2B 4329ccf53556fe7f6b9de50268eebbf89d70d6365a4441f9c1358c647617d29fd4c1ddbd6cbcb75fc84ba319fa9c10d98c012ab14a5fabfca170bc6c0a2c92ef SHA512 776cc21474e8a394e372ae34afe8c742ae30f01456497b7da6ecb33ecd0dcd6a4b7a11c2abdffbc7a5af931fbc7ad7918bf882ad0602ea6ed8178ac814f9d8a3
 EBUILD selinux-kerberos-9999.ebuild 285 BLAKE2B da1efbacc0d2bb950c43dad126f2eff01b77697946c5a7f38ef0244fc352b47d81bb8a3e4097af48ef25019e2e21bd876861c6de71a05aee5c0c08b4221f6525 SHA512 585e3a3bfead97802f5dcfae6651e7fffdf7282287b0fc4a542eb05a84b181bcb1ff7a4d9972e9a10a0efe46a0d59ac08566f2bd4a6858a3b8163da57a6f98f0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20190609-r1.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20190609-r1.ebuild
deleted file mode 100644
index 0c1e835f8632..000000000000
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kerberos"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kerberos"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kerneloops/Manifest b/sec-policy/selinux-kerneloops/Manifest
index 0f11778c9204..84a1ca231be9 100644
--- a/sec-policy/selinux-kerneloops/Manifest
+++ b/sec-policy/selinux-kerneloops/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-kerneloops-2.20190609-r1.ebuild 287 BLAKE2B 3e7c0d257c03a8de0e40eb7a0b4f83bca20f18f5a1927912c53f6befca9765a527f03ffd38e69f10d3afb97797238945ecb982703f177203d378079b4b87c0fe SHA512 b16b21bf4fff03f05d1b449f6b66b9c0272a3180a80527b5b26b2cfb844943410035b87e7638bd48f42e32748763987f503995ed79ec3692eec64c81cc18c95a
 EBUILD selinux-kerneloops-2.20200818-r2.ebuild 287 BLAKE2B 5b2247d589ed6b4f1a9ce5b4ac1bce3f35bea683fed4f69e0d02852e43f1f86dd57409afada0f21c8567f3d4d697919896e5c6e59469df67fc00bbe52bc96fd1 SHA512 e18068fa4f1eb71e5124219c5b95db567f8ec20a8a3fa38123df60f8132863e7c819441bc3be9c956b0478eb1e2d97e050171845335b5663cf98adbe0b120eae
 EBUILD selinux-kerneloops-9999.ebuild 289 BLAKE2B 0f1ae71a11c3552894fd26ce1be29c326e761c5389cfdc7f6b23d1374fd137c91f533dd03f0370b61a30e8e4b253d22385988c7829447ccddbe1512feecd40d5 SHA512 f0bedbf6721cbf39cb8caf6673cacf7b28a77fe64a966678e5a02a8aac428806d3fef5b5798ef7eca8b5de5b313e13fe95cbc2cfc18c28c1888585a05431e84a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20190609-r1.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20190609-r1.ebuild
deleted file mode 100644
index 065d662724f3..000000000000
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kerneloops"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kerneloops"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kismet/Manifest b/sec-policy/selinux-kismet/Manifest
index 3c9b13838d28..302b556299b8 100644
--- a/sec-policy/selinux-kismet/Manifest
+++ b/sec-policy/selinux-kismet/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-kismet-2.20190609-r1.ebuild 279 BLAKE2B 7a08592bc73eba9fcde5ec8f23a3a7506cdd7b77681dd03d2645c3d20c9c6c2ae5dc48dfb9a6ca7a79376074c17bbfc565b3c7c75852de636507b3ab37e23f4c SHA512 1566bf7a62bb52cdc2ccff7d909d6891ba3a44a56b5d0af8a3464aaa8a27f5d6952fd3c4c83b60e8bd215dac27f708d2e28ab38a311685e587407801b409da37
 EBUILD selinux-kismet-2.20200818-r2.ebuild 279 BLAKE2B 1eff758d3e593549c87a2fd0ff9b02a55b6fc0a4dc19d0e03e63f39e20f7428239f668b8ff053131ed5c04f0cfe023a5fcde2d99242e63f6504c25213f5ee7fb SHA512 931f597727a08befceb081c2626d599cbe4df3854e4f4d9c5aa1c955e34aebd1e7b5d3cda822a8961d8a67367e0ce6836053c1bde92d9d2e95caf7317866910c
 EBUILD selinux-kismet-9999.ebuild 281 BLAKE2B 0e7f04a544ff42245fd572335a1ab0f4faffb3dac9794082bcd0c40bbb6c54301ff9bc0e3fe2f1f4faf4524d6f4da2d412b0272a21631b73d1ba06592a432141 SHA512 d221092d6c9ce8c95fe516ab8b676bbf49212833ce3679e3404834669a806199267f1c70a51242ed46236603665d6135b3f454b5ef543b16685e46bd86258b97
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20190609-r1.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20190609-r1.ebuild
deleted file mode 100644
index c301d6ecc7da..000000000000
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kismet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kismet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ksmtuned/Manifest b/sec-policy/selinux-ksmtuned/Manifest
index d9a7d7524aee..390c2b7cafe4 100644
--- a/sec-policy/selinux-ksmtuned/Manifest
+++ b/sec-policy/selinux-ksmtuned/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-ksmtuned-2.20190609-r1.ebuild 283 BLAKE2B ab4270e97b767c41fe852b34f1e9f94eebc0e63b062983a3415018b445b2fb2345e0f5a183c8a36f3b68e883382a387297e0e19fce724ebd1b00792c3d9daa35 SHA512 a52689efde12669969e8e47d2610d3e27304cf8481b77ae3063db54a893c2889638c103ba248c8e6b59418e49f7945ca63ff65aba54edbb3133c6b9e3151210a
 EBUILD selinux-ksmtuned-2.20200818-r2.ebuild 283 BLAKE2B c9e35c58f1f1efe1c63300bce9f2e45bdf962bb293c63c82c3014d4b8e42039797069791ecea75a575544557b06360a760341abfe3bd4602cf1e34ae7f776535 SHA512 41722a8a690ebb4224de7315599f9d20a4186a5f2f390b5f2dd708aba10d306ffc0e37232e32a1e0b40fe9d7020e49c068619dff277065bcb57cf25caca08572
 EBUILD selinux-ksmtuned-9999.ebuild 285 BLAKE2B ae7c8d7a0d076763ad5e7341d1a77446c85384175353ee059aa7a03e8a6f405d982824ea8e73708c947b2bdab91f16d3673b899ba6e206f5588620d2a23735d7 SHA512 ff40abd27327e1a151b63c785c90ee516be48ad3f879239daa6de620d1cefdbb45aa6c23f956156e022d28dda9955ad3805b8aa959cb202bd09c3b20848658e0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20190609-r1.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20190609-r1.ebuild
deleted file mode 100644
index 16daac0e0a3a..000000000000
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ksmtuned"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ksmtuned"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kudzu/Manifest b/sec-policy/selinux-kudzu/Manifest
index 8146ad8a718c..4c148cf40189 100644
--- a/sec-policy/selinux-kudzu/Manifest
+++ b/sec-policy/selinux-kudzu/Manifest
@@ -1,8 +1,4 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-kudzu-2.20190609-r1.ebuild 277 BLAKE2B 77967b6e4a385d4ba95381f562b878f6e947fa86d54e3a81d11d8e10ee8fc1bcb45f1218967fc62b497cc0fb557a4726e8da68c1eaca68ebf148435b99cc230a SHA512 9b2d26b1027761bb72bf3e1ea5431ee8bc8a72124c0864fcba223fa5f04ab3e013c6e6f45c4ab8228da5e6d2abcef35b64d358ee7719e93bc5bbe1334b99120e
 EBUILD selinux-kudzu-2.20200818-r2.ebuild 277 BLAKE2B fa421e691d061e7b6dbd1027195894c992ab906fbc11d375978a506e4cb20dc3977d82fe952a45f5df6bbf86282c4439b93a2e1490630152be33c060c279c11e SHA512 19065d57f0903cb36e3219a0a00a8e94740490e7201ff44c6180c64ce6f65e65497a037b7a4f103e6f10e4ba37ac2c6dde32d01a2093a57194ff51234bbed799
-EBUILD selinux-kudzu-9999.ebuild 279 BLAKE2B 64dd8b3924db2e2d14ff48353e12cf3f62c3e15b4ada408a388b043759277fadac0c860dbc6b30d0afaf49c7932af5c4443e4861e93d096c34a8a9e7e5f35fa5 SHA512 7c19c49cbfb2be86e738da32f2d145c32f8455df962c8e01d034a8a6607600561f9b475264e2bbf6a688faffe1a6aad0acd782e0d79f2ee2a21cc27a11791702
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20190609-r1.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20190609-r1.ebuild
deleted file mode 100644
index 4e89d9490b68..000000000000
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kudzu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kudzu"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-9999.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-9999.ebuild
deleted file mode 100644
index 6eebc17bb020..000000000000
--- a/sec-policy/selinux-kudzu/selinux-kudzu-9999.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-IUSE=""
-MODS="kudzu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kudzu"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ldap/Manifest b/sec-policy/selinux-ldap/Manifest
index aec4ebc543ea..8e2bfeb7a2a9 100644
--- a/sec-policy/selinux-ldap/Manifest
+++ b/sec-policy/selinux-ldap/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-ldap-2.20190609-r1.ebuild 275 BLAKE2B 31ea95c2572ed900f869390344c0e39a320c1a0dd13d6aa0d0170c54b2519ca0424552d1dece8d8c090ed2d529bf4e6b9c253c3b331b0d6fde7a9460d02c8b20 SHA512 26f77f3d4da77233a30563a94f858ee3b3f247fd6687f0bed107df470d45511d7e876c9d3884770f72419f81a99bf3745c7b56ee8d2f6169e2737f89e2726cad
 EBUILD selinux-ldap-2.20200818-r2.ebuild 275 BLAKE2B 27c4b0dc6ee5962018634f1ced4fc2b10f798ef4b4da4cd90a8f33365805a48c8d5a4c13ab2ef5e4b00ee545649beb5112aafd47d8a05c5e53f6dc5fde47c1d4 SHA512 8e5dea7e798f1a2f39fb727fda1c90ca0f8481d37982af3c9f79da133183b76e457715ad0593bae9152c9090e355ac6cb27225ccdf6935bbbf687ede1f25e8af
 EBUILD selinux-ldap-9999.ebuild 277 BLAKE2B 2afc657d58c84cc627d20bf069067a771af26df4bf5557935b123ef4bcba1e75c6ff832838a780ef8d6411299c605ecbc5e359702d5ac4b04d312b254f66d18c SHA512 d2284ae0364732b5717693f22b73cb9dae83d0b30db00e428bbd15c1f7d084e7c9a87ac86da33a4f199b922f1dc263efc36ca056176bfa4e0ef411de3c3bccfb
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20190609-r1.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20190609-r1.ebuild
deleted file mode 100644
index aaa85782ca29..000000000000
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ldap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ldap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-links/Manifest b/sec-policy/selinux-links/Manifest
index a0e209c28225..5f92db57f128 100644
--- a/sec-policy/selinux-links/Manifest
+++ b/sec-policy/selinux-links/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-links-2.20190609-r1.ebuild 277 BLAKE2B a729cacb89de0f5a4e74dac77a8401fb87726a0cb8ac56ea638385589dd59d3af65a243f285cb8e2308c3a3b453bb2412ae41a3bdd988ebe434e0bcae2267230 SHA512 be4f5c76c9ea80c4c145e17582979c6e22edfc43f0cdab6cd6e4e070cfc4b79eee6f29ef8dec1faf7b30fb84f251e920bfed272c174eb529c25ae5f7e2cf5992
 EBUILD selinux-links-2.20200818-r2.ebuild 277 BLAKE2B b0a87fb0949d8b9382f00d8f3f616efff9b1bc155e7fe50e407184341c33e9be586a58f281e985987eb43d2945331c8aed02f83f5d8dd50908761ffffcbd3119 SHA512 7d3116edd1581948495da62eddb7582a1b8dd70dca2c3c01b549d2c023fa0755b99e0d17c6115e87522bc9ee644112feb33e32be7670431bf56c82a68a9df8a7
 EBUILD selinux-links-9999.ebuild 279 BLAKE2B f1db4b44a889cfccdd5ede41e8190e70445f040b4f820a4b586553fa5314401748953e30bdd4b0e9562e80dfc0220772345465e992e80040a71dace923d0df84 SHA512 5f1418d0a63a92e0e6d8567fd27d8f2a3c85b1be0481b0f67162b1e37d0701c112e5aed4b92c3d7a88953902700a2e1a9f1963849fb1062496aa61ed12b48b2b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-links/selinux-links-2.20190609-r1.ebuild b/sec-policy/selinux-links/selinux-links-2.20190609-r1.ebuild
deleted file mode 100644
index 0e7a13b9a2e2..000000000000
--- a/sec-policy/selinux-links/selinux-links-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="links"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for links"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lircd/Manifest b/sec-policy/selinux-lircd/Manifest
index da145c5c5dc6..7305b0d8a015 100644
--- a/sec-policy/selinux-lircd/Manifest
+++ b/sec-policy/selinux-lircd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-lircd-2.20190609-r1.ebuild 277 BLAKE2B 852848ab60d1bad38c4fb2e0747e2e964fcf7a96dfcbf648b7c509f817bf5cdfa6794297abbc2896a104eb7034314c302520e081428bf97b7b8a9e447a0311a8 SHA512 126f27e675494be8dd61f06ecf7e0e4ddb95aee4b0878030d6858ea69e59e247abafda271d1a1cfeaf400025ba24596131d4dfd7e916c160e3c76465289c0756
 EBUILD selinux-lircd-2.20200818-r2.ebuild 277 BLAKE2B 932acb515ce33edc1bf698e32d1b1363445f4f540d6119a96393abb7b749a3fff3a081a5ba38ba5b03ad2630fec22cce0c1be2f95e2c200ab8181878555d6b8d SHA512 e120eb52f9e43f503409ac0ab38dd3c3d98d32a83665b9b457ad6a12c9260934d7613538a6a126786d29086022e49580dbe65a5a30a597ca599ff105d98ee948
 EBUILD selinux-lircd-9999.ebuild 279 BLAKE2B 695411eb852dfa55a1fe57d53b3ff638f19623ebde04ef1fc761f8e9a4ea9505e3c915ab67fdfd2623e97aa7bff01a8a062242e1cfd42b6e30d7a0de3925737b SHA512 b2c8ac56f7501968de85af913fe91026872705d6920df06ca26ee072ae820ba35f4f60ae4c5085103ef90ccb448f85f104e55ed89e760bcf23484e48b6e9860c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20190609-r1.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20190609-r1.ebuild
deleted file mode 100644
index 18448d3ac07f..000000000000
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lircd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-loadkeys/Manifest b/sec-policy/selinux-loadkeys/Manifest
index 14cd493cba0a..28b784d01390 100644
--- a/sec-policy/selinux-loadkeys/Manifest
+++ b/sec-policy/selinux-loadkeys/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-loadkeys-2.20190609-r1.ebuild 283 BLAKE2B 829a2f0ab38b02e4935f132a26fdf56a630b40b2c18563e129638fa755c35733b21d44826295f853645622004d6c33d93c6b9563b30a77d958ad8f733b2fe85e SHA512 4fd82ffad4f23c2abe5e710c4c555971a0e61e6a5cf8a6f2127c75f7741bcda31736ae328a94b412339ffa57974acc1a53a647c1622d8dfbb7c57c62e8ebcd74
 EBUILD selinux-loadkeys-2.20200818-r2.ebuild 283 BLAKE2B 0bf4218f1af21579f58c49a9cf958a60aec1de27fed96d68317950bda36407155740054be03fe0c3de71cc9ed4d4f18f457b178ce15da08febd276be5f292d5f SHA512 f79a070678e8f28be3fd8cd3a386dceeaf17f16cc5db0437406017b286aad6c1c3170813df6cbbe7f6fb4b64a6c894de3ac131a681c4aee7f777232175cd0a1e
 EBUILD selinux-loadkeys-9999.ebuild 285 BLAKE2B 23a023328242d074409649d8a35755afe8e63d1359aa1b3f941d8de68ad5796e12f056b453554e9e0b753dddcbc3a3666e7104ea3a1b49ec06eb395e4e1854f7 SHA512 802a3e5ccfbed5ab4d175d37f6eb8bf9fe45dfa948adaf30be6f3fdf5d7dfbb1d76399d360059b27536d4b0b8f6412370b23f153954fe29a6762c95ea137e1bc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20190609-r1.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20190609-r1.ebuild
deleted file mode 100644
index 4560a75336fa..000000000000
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="loadkeys"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for loadkeys"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lockdev/Manifest b/sec-policy/selinux-lockdev/Manifest
index bc5ccff623ff..5ac44f75e4a9 100644
--- a/sec-policy/selinux-lockdev/Manifest
+++ b/sec-policy/selinux-lockdev/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-lockdev-2.20190609-r1.ebuild 281 BLAKE2B e6ffa3646e8b12c1dd1a33f55aed56a4123a26ca7b2124a3fbeedfd4f45a19324144a56c37432a2242a0ee7ede0dca64b8e9e04b72369a502363ed8ed0734130 SHA512 0f61b429f8ecef7386ccda63b30bad29f20d3db2fa8f2a89dce59f12896975a19a8a3dad71270d0806f5d41293328dfd1a7f7aa257467822df225e25adc02d17
 EBUILD selinux-lockdev-2.20200818-r2.ebuild 281 BLAKE2B 9b986b51f28f9b7dddd4305d8f9364b7c3f96125449bd67275072f53a81fa1b6ac18a320870a9533b74d2f39d6b06601a8c6b2b91c348196fb56724133eadaac SHA512 6c3be5a73df19a4ecfdb1d5ce47af9c94902d22748b0111580a0a8a3805ec39edcbeb521451762d113f33e40940ea023ba9260e3e593f31654d124dc768f7c83
 EBUILD selinux-lockdev-9999.ebuild 283 BLAKE2B 58b43f24d4a5afab6514afaa02826d7fec99cef6157a242357eaddf0ebf02973bb1109e346be3dcd3e52b517e8a355f199d4af3467b2fe49a01aeeeb4b31309a SHA512 6bb0cce3633919281e5397641c4bde043a26fac97ecfe85d9e32fb1f33b9272fd02468212147a901873b0e12ec5a183721d6c49ca9179fc9ede8c07208191a2d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20190609-r1.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20190609-r1.ebuild
deleted file mode 100644
index 77de449548ba..000000000000
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lockdev"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lockdev"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logrotate/Manifest b/sec-policy/selinux-logrotate/Manifest
index dea1958e9aba..91b70f43abbf 100644
--- a/sec-policy/selinux-logrotate/Manifest
+++ b/sec-policy/selinux-logrotate/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-logrotate-2.20190609-r1.ebuild 285 BLAKE2B b82329427c598c7f05cfa390ff81cb150ab9c2f73ec550cb0d60f7a44a20cb6a573afeda058784a6147ee4435e6cfe502f0a64aea8094962945e3652a128c05e SHA512 c1102a97f3c1aecd94924c8559200f8bc419da5381f914c284616051c1a732c6320d5faa141e7c7a5d5772a3fc4d41dbfa385b82f7072955c27f1314dc98dcda
 EBUILD selinux-logrotate-2.20200818-r2.ebuild 285 BLAKE2B 50da7bbbd3c21edb0c55b0a35ba6d50b6a3c107cdae4a8ac51e7a2f0b45e0f2ca74a48f6389cea0276598cf3996566761521a5a0dd270b04b17646d0c8c4bbbf SHA512 01be468a7b3ec2f658d7244a9e70301bd7aa1334f771f2b8473c019a23d7cb2587fe0cd482433ac5f40fc9b78ec8bb329ce04c85270342cd0a9b8447cfbc2a6c
 EBUILD selinux-logrotate-9999.ebuild 287 BLAKE2B 7016bc5050cec24dba3e79c5c15936572f6920c3630d8c3d936881b470abf96b5f94279480718f8b0d6422b40a080f5c6fc2519ce1d0678931fc8381b84f040e SHA512 d7d8bb06b67c34722eeb6075d8b5f170e71a01d1589101b111c79bba7ae60a1cf311a65a42301cbc68a84d19e85e91c63bf0a740685909a9374030f065dcc40d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20190609-r1.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20190609-r1.ebuild
deleted file mode 100644
index 49f652b1d083..000000000000
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logrotate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logrotate"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logsentry/Manifest b/sec-policy/selinux-logsentry/Manifest
index edd7fecf8a63..a93a7d0f2532 100644
--- a/sec-policy/selinux-logsentry/Manifest
+++ b/sec-policy/selinux-logsentry/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-logsentry-2.20190609-r1.ebuild 285 BLAKE2B a3b25819b0ba13aab559e2fac7d772e2fd465a70fe8e00ed5e361c3c27c3d745648952e86b3b88131f3872cf61eef604185950b8b3c320c997cce3be1a25f689 SHA512 c304f3bf589a54151c71a5849acfbbb024920f4aba1613c3088fc8e6a556f885ca405de2e2ae4a69c6fdf717bcfacd5a298ea851d8a44157d56ac855c2935df8
 EBUILD selinux-logsentry-2.20200818-r2.ebuild 285 BLAKE2B 16c5361b804c12dc3edb5501ba3abe380e7841eccda54d06bea399f6f8c08a0b1f900055f738064b115124e254110c3935594d9cfe5bda3f4997678bfeab86a3 SHA512 cf0f79b987eee5eaded2d7ee689af16d852e8dfd18af026bfc43eebc8d54f75884a869c18e75bbbb553336c8834e1b7239402016deba349171a32ca3ad1373e8
 EBUILD selinux-logsentry-9999.ebuild 287 BLAKE2B ba6758f905d3a0966b7d1e2bf01732b11949bffb0ee06a6c38a200048c525345e7b8920657c2fc4e20d1f7e572ea24a2efe2c610b43b7e8b39c83eb9c2a023bd SHA512 ddf8be5e620af72eabc4f9dadb7516af076155ec1761816a956bc8fc8c281fe8163faa66de2d2a178b1064f8168997cefbb7a98cdec6603cc36b2d93320b3ec0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20190609-r1.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20190609-r1.ebuild
deleted file mode 100644
index 7f91dd895116..000000000000
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logsentry"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logsentry"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logwatch/Manifest b/sec-policy/selinux-logwatch/Manifest
index 3fb24b20ccce..7f4bedc8d9b4 100644
--- a/sec-policy/selinux-logwatch/Manifest
+++ b/sec-policy/selinux-logwatch/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-logwatch-2.20190609-r1.ebuild 283 BLAKE2B 0621c670e01655b2b1b6c34576e87947fbed3fc98702302875f33d6343a645c9618920f36fb9749c6720722eb531bd71e7a4c53b760f4763aff39416f4ab1fbf SHA512 d4c5a2755b2f28893818da317eeae60dea900819e08f8379f09131a57717de58eb8250cb198693fd4564b300ba16fc44b8156f0e36d5a76e48419fdc03de5bbb
 EBUILD selinux-logwatch-2.20200818-r2.ebuild 283 BLAKE2B 5f4d0e3e2d70d58328aad2d7df68213fd4ac1a8c974b81c3b9d8a403b8135ee67a59a584a3d3a33064d4f2f38ae20680cb1f650421cafd6c6ad5440620545d79 SHA512 c74bc0b4eee2c7b0e30e56e8854b0f691231bd7ca5045543da4f1a50ce1b1bafeca1979ece0a132fc9e77bfe179f92c246f3171922d46fd380b582e055d025dc
 EBUILD selinux-logwatch-9999.ebuild 285 BLAKE2B 2c1b618a91a526cc6c3a8e5eb4d2d42af793caa64f70b71618e2002b458a5db09b059cd2fcd1364f3c6e5175bbce67fecf71b2432ca1dd264a6524fd9e9a74bd SHA512 47a34a6da1b49e82a7140b93bd60329c1cc51e7719a49bebbffa37d3878432030baf40bb7e031b0c5620f7c3151fe5e88488c423a0a4e4f751eca30bfa01419f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20190609-r1.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20190609-r1.ebuild
deleted file mode 100644
index 3a234e51c806..000000000000
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logwatch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lpd/Manifest b/sec-policy/selinux-lpd/Manifest
index abf92bb64cfe..5038f3f7589c 100644
--- a/sec-policy/selinux-lpd/Manifest
+++ b/sec-policy/selinux-lpd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-lpd-2.20190609-r1.ebuild 273 BLAKE2B 930fa66f06056ec2325cb0992e25192f313b946ac3a353653ca515f9e4fcb0edef9723ff88ab0d69c8e1c6ae70a9fb98aa5f4f4e5700c98856d5fc5d864a303b SHA512 31ee06927ec7629dfcdcf05eb1930eba2eeaaf9df0b5d41a267f5c54885d825cdf9dc5d5cf67c08a43514e171e71bb2af5017dee41900d87a48db428094455f3
 EBUILD selinux-lpd-2.20200818-r2.ebuild 273 BLAKE2B 9668f3d02be1f0cbb344cde61e0a815c65f0cc03843fd67817befa1f0073ca0268dbfcff3b6840d679a394ccd173ab3e78945955e5d89973e0d1d95a04ca79e9 SHA512 0bd4abb13f76777ca9d6d03372acf507d94967271afde058403aa1873ff124d949dc0586b8ca086a1404046125c48cbd25d78bd0b83128d20c2e94e081d7d688
 EBUILD selinux-lpd-9999.ebuild 275 BLAKE2B cd86629e3226a5d9416a9c2d5c2795e5785bee894b9c75e8f48eea340e5262063b8381131016ff978ed6c346cba60b9bd09649c1cc035cb0343b7ab95defafdb SHA512 fff13c5db13acd1ac7c5a2c334abb48913a855a4474b283d4f2e613858760a78f93a57f35909bae3b96a016dd52905bc20883fdeae3e22dc18e3a5aeaeb87a44
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20190609-r1.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20190609-r1.ebuild
deleted file mode 100644
index b2c7d271bd5e..000000000000
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mailman/Manifest b/sec-policy/selinux-mailman/Manifest
index 25af83808d64..8d58c04beaf3 100644
--- a/sec-policy/selinux-mailman/Manifest
+++ b/sec-policy/selinux-mailman/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-mailman-2.20190609-r1.ebuild 281 BLAKE2B a630cd3e7376b1575273b5c7521a8d2da168ea77d7b808b3055b4f395565ea1a5c3b084fa1e32b1e38d65ca51b99c24ee95199720fd2197f81af1fbe08e68081 SHA512 9a6108e7a2b40e5cd5d2d76361917bab9de1a0d7d44e86474f6c5336c97e91deae47373ce9c80c40d3626bca7e1b6c283fdf44bb720e284084de9e8c72654cdb
 EBUILD selinux-mailman-2.20200818-r2.ebuild 281 BLAKE2B b9d9c79ddaae59e39837850d413bac9a38b40b154e0f2eda774ba53c81ce9ed1164decb210c7963866bf6f678d486579354a93ffd109584fb8fb28e4416d291c SHA512 ee997c267cee68b1d327694fddc97093b4fd4acfcca7d6e1ceee088b2a511c91c48b418be3b7d405cce811eb332dd86a6dd838d4b541b9e78359106117aacb73
 EBUILD selinux-mailman-9999.ebuild 283 BLAKE2B 70be0201e9337a8de7419e71fcaa7a533e46713257d39c801f44569937a794044613d377760a2b727772a57dd42ef21056b6c7cc7c6a9a200d31643177e141b8 SHA512 2338020b788c1831837c508b8ad6023474dd1c80a479f9e58cb5c41d18e54069d023602071b5facfff900492593935c6736ec13c093d39046073aa23821f80ad
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20190609-r1.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20190609-r1.ebuild
deleted file mode 100644
index b42f37fc64b6..000000000000
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mailman"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mailman"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-makewhatis/Manifest b/sec-policy/selinux-makewhatis/Manifest
index 256086e7da2d..b022b2ee2bc6 100644
--- a/sec-policy/selinux-makewhatis/Manifest
+++ b/sec-policy/selinux-makewhatis/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-makewhatis-2.20190609-r1.ebuild 287 BLAKE2B c2054e70d80b0574f66bbc0576408743ea3224ccb4f2bb0861369e63ef1ca7feabc72b9b4a29ecf691ea97ceaccf7b1043b915ac8394c7dc69791cc2fbeb129d SHA512 bdaa22cc8759a37abf24ca2d1f0db7b0187798594bb5e48faa22eddce62d9539f5341668f98bc56b05f88bca675c89f8daa81daada29e4cc1973d1642e452880
 EBUILD selinux-makewhatis-2.20200818-r2.ebuild 287 BLAKE2B 2451d79fffff81034fb71959a8a4b15f54f0ae33c68f462ba9615c468ec1b36bbd6d51b82734fb2a786dbfa4d89e3b5fd1e9cfab20a308e818f1764c78d28376 SHA512 293a7e3e333267d3ab5ed2a0d477813ad15afaac10b0131c026d7963e4814b58b74134d569cad8ce02401af53a8cbfb88bdac8efe0c3167d9bccd4424c2f6cec
 EBUILD selinux-makewhatis-9999.ebuild 289 BLAKE2B 63a085d04c7cd6fcd3d1df4c74fe182da062c88316dd6e9576384b58d3d21a18e6de3de25debc3ff35b45337d008cccac210f8489fb061349a8a56eb0b213ca5 SHA512 eba7a757dbfe447b706c18b76eacf9fa482acaa4ce522b54c87b17c4bf3f95672aa42d4dd5f3ce9e526886b30d5ea1bdf41c670dacd3ef6e9c1be6b57c89802b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20190609-r1.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20190609-r1.ebuild
deleted file mode 100644
index 268267e945b3..000000000000
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="makewhatis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for makewhatis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mandb/Manifest b/sec-policy/selinux-mandb/Manifest
index 651839b5b00b..9211b75cb181 100644
--- a/sec-policy/selinux-mandb/Manifest
+++ b/sec-policy/selinux-mandb/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-mandb-2.20190609-r1.ebuild 277 BLAKE2B 9ac772a2d3edba6f2b1deb8809248eb2762d22618e2133be391c2cea9cfdf4d094258fc850e52072cd8855a2cddbc97e70e6e644b98c6af376b6f25de4c96955 SHA512 ed29fe1a629e939492067da4fc95b891d363fde299e63084f7bf8af343c925c3a37ba694184b486fec7d1da9c9d4cd9381b5a752c87eb859625598f54992f869
 EBUILD selinux-mandb-2.20200818-r2.ebuild 277 BLAKE2B d25deb063abb5e411d0b74ece36c15749f9cda3b8d64fecb6c659f4ecf1f4a9b9a6588f144e94fba2b7ceba8cdf99a77ad88611443017da5116cabd45a10897e SHA512 bbcc89561eff88e3d57bbdafdc89f232a827bece9e777539bb80b2bf1e8930eada844ee4fc3cf9c521184b528042f02e8806a89b06b0e93a518fa31ac2bb8972
 EBUILD selinux-mandb-9999.ebuild 279 BLAKE2B dbfee53b2dfacc4599fc7379f93c982880ef8768df3f38339866138e2feb0aaf90265c7a65da70d94545eba56284fa97fb12ce8eba78cb0ed2aee30e7bc6b64b SHA512 7287467ce66f040217f3e712d641ee5b65d2dcd0159a649e0350f11b71ba22602941c3c40e4c65062699639b2fc03b2f3be3ae3a2d9ffa830122a1052463525f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20190609-r1.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20190609-r1.ebuild
deleted file mode 100644
index e643eb2f28df..000000000000
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mandb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mandb"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mcelog/Manifest b/sec-policy/selinux-mcelog/Manifest
index 5866cff99706..4396e63c762e 100644
--- a/sec-policy/selinux-mcelog/Manifest
+++ b/sec-policy/selinux-mcelog/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-mcelog-2.20190609-r1.ebuild 279 BLAKE2B f1c280daab33ad1c8292d465eef836b78429813ee18502630f878d330e7bc7d000a36397b4269f51eca4bfd7934674c916c6a05af50a2a3ffed81472f08a728d SHA512 e12e2570dfd3d400b57116ef349d3905588f111ec694fa1b53f1b2123da7b31e44bd321d42ed14d9238aa08dd9c5a94c62757b85296982b9bf5611f9e8d9b840
 EBUILD selinux-mcelog-2.20200818-r2.ebuild 279 BLAKE2B 3b09fb8ca34ccc3adbd3bf3ac59962df400518434074a5145e97e5e6ca5372465371198c8979ab9c96ce107af264d3011e5e447a16c6ab445edc06951899e367 SHA512 b41f8001a0a8ce41d09efcf9644a6b5ec23f61283fb47222bea267f1dfe85916493fb573652333d048a487f5e399a6ab15d1f0b23854b2315d76e126df26a0ef
 EBUILD selinux-mcelog-9999.ebuild 281 BLAKE2B 46e83fc47f39f7d8f620ff7ccd29ecd3d95204ea991a98078485d594406a14ace7de3362a87379adc7f16eb67fc0865c7106e1117fedc79bbcd2b020febebeba SHA512 6b46f4e0d0700daeefc6bd72ca29285c91c3b3e268d92a55261177b4384b798b481360a373396bcbe82f2b98c15d726ea7ee5464472bfe50dbdacc8351a2f081
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20190609-r1.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20190609-r1.ebuild
deleted file mode 100644
index ae3029b3bb01..000000000000
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mcelog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mcelog"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-memcached/Manifest b/sec-policy/selinux-memcached/Manifest
index 7c121aac6ff9..6ee758dfd46a 100644
--- a/sec-policy/selinux-memcached/Manifest
+++ b/sec-policy/selinux-memcached/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-memcached-2.20190609-r1.ebuild 285 BLAKE2B 185d4e6bf092abbc62ed965536bbda42b64660861e372f5774992c811d101bf6e14119e88ad32699743545a564f3de0492ea989e9366be3912c5fa480dbc0c83 SHA512 3b29fe6cd048cd8a27c78205324cd212c616f862508514ec22a8a3065a161a3fd179efcd5f7d707b52049d73d3c0208a7f59d7a402f666da32af723564c23a58
 EBUILD selinux-memcached-2.20200818-r2.ebuild 285 BLAKE2B 2fa50d91a00fcafd566a356b79ba8c9753766f5a1c6d23f2212030d9ecdc470bd8e1ebdebc5979a9b386a31a9b5e131a3c97f5a9441af5580578c131f1f2be6d SHA512 9d5e06f98afe942a4c584f7f7db14c22b233ebdb9d3451232c9d4056345edd65313a6a6aefc73a4298e13d2dea3d2c5b43f8b200a199e26b0147ee249f792d53
 EBUILD selinux-memcached-9999.ebuild 287 BLAKE2B 81bfb6e9284f25c3ab4b4c60cb5a7f956a62f24fb2ad83cfc95358f0689f4bf6fe74e2d7343ebefcdc72ecc19cd180998295ecfae85dde48b7c4a0a99bdccd46 SHA512 af240ffe19dbd60a93c8b923d39cc13efed240955407ad1a7b6865abbd07f7cb3dfb57a989797cbd2bee566e0a7be438cfb26e9a408830e367e3f19862bc4d6a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20190609-r1.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20190609-r1.ebuild
deleted file mode 100644
index d24673999f84..000000000000
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="memcached"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for memcached"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-milter/Manifest b/sec-policy/selinux-milter/Manifest
index 6352c7b98ed5..594d6e8165aa 100644
--- a/sec-policy/selinux-milter/Manifest
+++ b/sec-policy/selinux-milter/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-milter-2.20190609-r1.ebuild 279 BLAKE2B e586c2da97749731eca9568bfb42e93e1869df6fe18eba4a00425717f03b6f02ae663f3dc6ae25f43027d58ced48c4acc1233e1e2e894d5a10e21896519f6778 SHA512 09a609e2227bfe4f7a53b811beb69a4a48c4b23eaf3b7e9092c0f604519603c67163225b5bc51e25b8bcd077b4428fcb751008332bfaf14947253a21b14e92d8
 EBUILD selinux-milter-2.20200818-r2.ebuild 279 BLAKE2B 3bd82d6026414d35699e22232b7f12f08e063f6cbef3150d8e2e2ad47f1201393e202c5c498d6d35d25a1cd53bfd78673a3561ed5693d9e40f753787bc4da5b6 SHA512 bc285442387e4e06939e78c1c9a267c26fdf21fd03765697e6afccf20e7d3b5a307f7f6f38578d60570252d833e8315b94be13476ad17061676d36c125fa743a
 EBUILD selinux-milter-9999.ebuild 281 BLAKE2B 8471773e14735b3ccc602206b6f7cb9327a53ea3d7015c7bb87f54728ca2de87e454b46dcd87df44aa4cbe76159ddb146d0cb770127e39283b238e5b332844c1 SHA512 5a19712664836e23c77da29cc16f2bc468495099a18599f49563044f42fe1af61e2144ce219d72144f54c0894e5bbfbb1084e65d7565a7b59fa995d36d8ac3b6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20190609-r1.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20190609-r1.ebuild
deleted file mode 100644
index fd47440b3a18..000000000000
--- a/sec-policy/selinux-milter/selinux-milter-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="milter"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for milter"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-modemmanager/Manifest b/sec-policy/selinux-modemmanager/Manifest
index 559eb6e5b02d..fd1eaebf2aa1 100644
--- a/sec-policy/selinux-modemmanager/Manifest
+++ b/sec-policy/selinux-modemmanager/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-modemmanager-2.20190609-r1.ebuild 383 BLAKE2B af71b6f2af4017dc42979ca9a57751acebb6e66ce465c995cacd0c188777bd23dff21aa9ab1c034e66d3337572bb42f38fb9daed6e712bda17e13c1c05695671 SHA512 758f6e0ff6c12eecd11adec6c751b4e173f0de60bff9d2469c8fb49c57d89029915024c6840ba9895e8bd670941977b5609d6e90e01018a7a211e9d136dea33c
 EBUILD selinux-modemmanager-2.20200818-r2.ebuild 383 BLAKE2B c3daaa4faebc9b474df2426c3210629fcb0fb46cf72007d5a089ef5b305975b5a797ddfafa61490453e794b5b6b8bb3ea2ae672e8974bec5deafd371afa1c6c5 SHA512 0ce672d5f50eda853f845d1c9d8ae3437193a6bfd972efecd9ec566d57234b1b50ef9859eb7c18f2621dc5e5f62425f79c9efb8b87b6043bcef04b318d044608
 EBUILD selinux-modemmanager-9999.ebuild 385 BLAKE2B 745189b4bec820469568d6e523be21c9362c1cf633066526b998c4f44d1055555c7121a271ba09901f6f9eab9a9a8f92ddf016f23f3137c1d9a4ee75755f5119 SHA512 616215d7fd9ea95bf0445293d6ba74952becd0cd5c2144575375a2624cb90276cca81021f5c7c95fd45ab3aa86f37d7e5279d6a12a7ec506411c7a045e875ece
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20190609-r1.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20190609-r1.ebuild
deleted file mode 100644
index c778c4505d57..000000000000
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="modemmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for modemmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-mono/Manifest b/sec-policy/selinux-mono/Manifest
index fc750bf44b94..ec933d3e1b8d 100644
--- a/sec-policy/selinux-mono/Manifest
+++ b/sec-policy/selinux-mono/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-mono-2.20190609-r1.ebuild 275 BLAKE2B c0e1c6d3f4b565a6b7b25758e4b5e19abf7742c89f7ccd7ca52db9b6dd179c143377013bcc838b83570efcd0cd261cce6c21ff5845dc78cd2fc6746648e926c4 SHA512 7cf9cd3744017213b64d1a96e4cec33209ed8db884e61c9bc598dab904bfb4300da223b689871e75245dc4f4a9f633c77c1dd5ecc8e3bd68ce7f6e0fa7d03606
 EBUILD selinux-mono-2.20200818-r2.ebuild 275 BLAKE2B 927c6b7b013355f6bb71e1d5c9821f623f1d0798c1574a67af5bde5228c2799cfbffd5f903f72f9fe0e2a61723e8035b9c0703088486238d5bb2d700de00a7e2 SHA512 714e963da362c68b1b8d456010ddb401cfc2f6ed696086ea0fa828e0f0888ab38dd8d3731328cce1e3a7e032312f7fc5ae3114a4166e4df236a5cc3d19584ebe
 EBUILD selinux-mono-9999.ebuild 277 BLAKE2B 44e63d6a884accf9f484f508d4578227ca12f9729f246a5a55ee965692cea5e4344b72557a601cd2cb4f73f0d79bf993aa59831cc198640d495cdd984ee32ef8 SHA512 9cb5a8f2f20be621b49f140dfcdab03e0021e860690582135e2542cb58b1447200c8e1e5c8400da438c4c145bfee78a9ad116d3a6f9da224b4f3b31367411903
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20190609-r1.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20190609-r1.ebuild
deleted file mode 100644
index bc8639aa0f9c..000000000000
--- a/sec-policy/selinux-mono/selinux-mono-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mono"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mono"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mozilla/Manifest b/sec-policy/selinux-mozilla/Manifest
index 78d7126bf414..0f6cbe0ed339 100644
--- a/sec-policy/selinux-mozilla/Manifest
+++ b/sec-policy/selinux-mozilla/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-mozilla-2.20190609-r1.ebuild 383 BLAKE2B 884e3249671d226ec4daa509733f924ddbed4470c64450d04beb3bdc5803c76039840c568aad16550273f0124614fcab2e3ef10e1995fa5b97309be14f5c1a33 SHA512 05b1ded79f4573edfd02980275d812fb7472e1100ef3382e2aef032a56465595f35aa7d1d6f6a1522fe6955263f51afd02cce4bc168921e04d7319802945ecd0
 EBUILD selinux-mozilla-2.20200818-r2.ebuild 383 BLAKE2B 4684fbc5c1d46bcbf13af1fe3a569b3137246a0e22863b09d1a3d155473400e89ed4281d928b1c2cbc5c62215aeec385bcd778dd8429292494c7a9945cfd8fb2 SHA512 f4ec8089a1cc384fc9dd0045f1693268e200977b5829cbd5aad01397f75236749e1a40fa9fff19051735071088702442e3ff6a5cacc45231cc6abc7f35930beb
 EBUILD selinux-mozilla-9999.ebuild 385 BLAKE2B 543ca24ff85af21eab6d2e026fab00e79e320294fb42f10e7d1d3f43e536f3e2baa34216167c6ef8a1b7a3a8c58a9a4536ca62dd9dd7be4dd65359b6129ea3ad SHA512 77f4f7171bb07e2b450a60dcb8bff8fdc950a5aa666aace47cc60d8432332e538c0adcacbba0877f8fb573bc03346be2c01b01e52839285042939359b27cb361
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20190609-r1.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20190609-r1.ebuild
deleted file mode 100644
index 070f4568b4eb..000000000000
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="mozilla"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mozilla"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-mpd/Manifest b/sec-policy/selinux-mpd/Manifest
index 5879bad024d6..d0b4427cdc4b 100644
--- a/sec-policy/selinux-mpd/Manifest
+++ b/sec-policy/selinux-mpd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-mpd-2.20190609-r1.ebuild 273 BLAKE2B 8822d165310457fb64a2a8d96ac063bffcbb677aefa09488745f2b959757062a616e4856baef98f0896f8093e1ca25f39bb3a75313bf0e30312f62950fc47890 SHA512 3648614818192041ba3e00bd79b90efa551c4f068cface237bc7290b9e913d1b20d047b4bffa0e6911559322fffbc92a0cfef14f2cfd49b355f042a5126ae38b
 EBUILD selinux-mpd-2.20200818-r2.ebuild 273 BLAKE2B b844357445d1dafc1b9f1e8b73b421ce0f2cc748cba700f7ebeef09e79295e5042452bfb0752fde1f043f5cb6bf6f2f6cc0063e502468d4508a7853c381cb490 SHA512 38c5d52d5df9806d6815bd3535fe38434e975a2bf668e17dc0b892705676379763a9dc8f3c21d80e32bdddff6aea43dfb50052688a32a43685bb3c4629cdc6d5
 EBUILD selinux-mpd-9999.ebuild 275 BLAKE2B f2e9735b0c6845cb863cca434a92e95b0bbbba792482b847999dc7836be7d48a22158b93f432a541581f309649cb5c14ee501dc3fef9edecac448b5d72df4cd1 SHA512 45ca01decf162efc943614f6c2062dcf689c5a46865621ffecf45861a54c4382ffaa37532dfcc0e747ffcc0022ddf7a3d2536c1e64babc07be3f0e539c4dd762
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20190609-r1.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20190609-r1.ebuild
deleted file mode 100644
index 2a3affc8a356..000000000000
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mplayer/Manifest b/sec-policy/selinux-mplayer/Manifest
index 6acb0a7aa92c..b2f2f5109b2a 100644
--- a/sec-policy/selinux-mplayer/Manifest
+++ b/sec-policy/selinux-mplayer/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-mplayer-2.20190609-r1.ebuild 285 BLAKE2B 016d3eeb81ae1ad9dfb7ee4713770bf42d3053d08fa839b55c5e5a05fd2310d0b6ef0d1160bddb2b3cde3a1f2f935899ecf29959677e488bc8e2ef59a5187d0c SHA512 b1c878ed0f8c5097288da14c22627db2312094c3ac0fee32dbcf935534b5df3848739feadcf1ad1c0541dbe1553c9ee4d00fe7c8547d78ce682e5727a78efa13
 EBUILD selinux-mplayer-2.20200818-r2.ebuild 285 BLAKE2B ac34500dd6095abfc0f997aa790bc872511cebe4deb12e2d1e508bd2ac3d05dc1a0db3e045b29d383cc9c7793296f7d2fe23619838fc2876c046a85c4d8cbfc1 SHA512 4d5bf3ba7ba3d06969044217de9f75f2a10d809a779fbd8415dfa7fd6127dae3f6a6e02eb7218ac320b94909f17fd45316aaf8b12ce1c606ec6605c6d0b52adc
 EBUILD selinux-mplayer-9999.ebuild 287 BLAKE2B 2687b096aa2e31b57818cb45a5726a3756baf75141c646b7f9fc1efcce5a25ac3917d275ddecbe848e4cfd64f33c24837b338dac6ed4039737da7a91ec519d9e SHA512 3e6c26488b58eab38ed4a38117883c13daa70a9814fd2b716a4b02fbb15185967e51cbc7fa2650dd700c2f6c498834aa5006d962c95d3c1c5de11ed92e31c5d7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20190609-r1.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20190609-r1.ebuild
deleted file mode 100644
index 8dc0b1acce2c..000000000000
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="mplayer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mplayer"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mrtg/Manifest b/sec-policy/selinux-mrtg/Manifest
index a019b5f48b41..2276b2eca6ac 100644
--- a/sec-policy/selinux-mrtg/Manifest
+++ b/sec-policy/selinux-mrtg/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-mrtg-2.20190609-r1.ebuild 275 BLAKE2B 82ec1eb20dd22049692b41b06d58f7d5e4c8e1a5f3a723e78ed4ba567f35b17738f87aade014ee73ad0d1c3dc58389ed54df66de64a1317de28b0fad08722591 SHA512 ebbd7531ae2a4ec415a30321d6b8536de9830d2515266e18fbb87944a0d16e34a942d9b4a12043a51ce5050ebea6408086b689725ff279209519ea0c6d8eff6c
 EBUILD selinux-mrtg-2.20200818-r2.ebuild 275 BLAKE2B 2e9b2157e406e3d67f9487ffb7d4550a033800a835c24dd938c04f3efd451ff43e1afeed6679975fb9163e53a7eecec94dc619cca194d3a503f5a6af31c206a6 SHA512 e58f8cca2b422e0c5ee8efc04cd518e541266ef9ed637b77e98a6ead3721778475441ce94087f3b8f31e99ccb5535f568693ad969a51d2753946f22a6e300e39
 EBUILD selinux-mrtg-9999.ebuild 277 BLAKE2B 2d26420a0309dd7b2fe0421a698c9de50c7bfa0e9815f16b050283d25ccb7b81032c23d0067b2bbd1e0276f2108966b932193e04a6712f1d0d6bcfa44775c776 SHA512 703e0fc969cbf81320e124239f63624656baf005a7ee9855990084ef10ae1102fc78a1087b899eb2aaaa771270808042b7748ca5165452b534720fb97e46cfa1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20190609-r1.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20190609-r1.ebuild
deleted file mode 100644
index fc9606ff5b50..000000000000
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mrtg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mrtg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-munin/Manifest b/sec-policy/selinux-munin/Manifest
index 8b68e1c3bf9c..ff2322adbbcc 100644
--- a/sec-policy/selinux-munin/Manifest
+++ b/sec-policy/selinux-munin/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-munin-2.20190609-r1.ebuild 373 BLAKE2B 18894fa79e099fbab5f7a992a27cad6fa0c426fc21cc5a0c32c00c2bdc1ed5ed052ab3c33b11f854ea5884c90c4654e1e1dde37fa741783db387cadf41061f85 SHA512 4e6e5221456bad0cc842f21e404d4ab569b3a5d4574fff1e3d230eea556e6655d54b5520446695fbe71f508ab35f805bb183ffe96757cd0c199aa549cad5ea1f
 EBUILD selinux-munin-2.20200818-r2.ebuild 373 BLAKE2B 38ced17ffc9fa9f4d57f88c0fcab4c06aadf131ae173fa61fd3899584378d9dc71d861047db2e288849d77ac009c12a53f0a80b3d458ec4bd4b0f16718c8331e SHA512 86c4e8537d7d46b900dcd2ed46c3068071b40a3cd3957f743198a9d3902765f4df693af27dd4d7381c482193bb613cf0bd69e4011864dcf663f0979a7db84419
 EBUILD selinux-munin-9999.ebuild 375 BLAKE2B 8c4096ed2a7f4229c550f92735309080ce2de36c2da877139a07d3468206d9ac8f61e2387b92cc4e760b90e2a6b1b247cce52b979091de2c87af3348e60617af SHA512 4cce2cdda96652a459c0dbb754980cdeae6c38164ced268d57e3af2217fef69b1686940e2389e544519ef6ff230463c5b598611f343dd4dfe750417e23f4c512
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20190609-r1.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20190609-r1.ebuild
deleted file mode 100644
index ca842c4104b2..000000000000
--- a/sec-policy/selinux-munin/selinux-munin-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="munin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for munin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-mutt/Manifest b/sec-policy/selinux-mutt/Manifest
index a2f4ad27bf42..6c0a99408fc8 100644
--- a/sec-policy/selinux-mutt/Manifest
+++ b/sec-policy/selinux-mutt/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-mutt-2.20190609-r1.ebuild 275 BLAKE2B 4678e6495d0ad049d93bbdad6d1c8d31b981de0e7e47c392cc146c1254a3508b5880437699adda0952bc77ec4b3475158eba8f4a524179145d752a0e0f45e32a SHA512 8bf00cdce8a56da8d24a7fbda4368377e600e24689e1531777e4128f109b9057a392f978ddd435c9e9150816ac2b0007112b7ff422364e7a00db195314b61f22
 EBUILD selinux-mutt-2.20200818-r2.ebuild 275 BLAKE2B dae463841b29854789864ccabb3bc4df8afd54f85b628df24ed17fbdfb8a9c962a0706ccc2d12405ad44e8ba7e91defe2d7effaf44219fcc1b59ede7bbf3500a SHA512 e49c15d012ca841dabfab07958bec00f9a58a1b6611435e433ddbb3eb3938596f7f0d19b5da065eb4ca25f74d8332fcb736e3715f92207ce60c81470764fe6a3
 EBUILD selinux-mutt-9999.ebuild 277 BLAKE2B 3c86029dfd16a6224303790efbd5d5ad0c033c16d4045e78028a2f45c9feea6dbcf8cd4ef3f8d36290715d9273ca4e19b4a68c8fee6ad9bb186c8cd145aa3728 SHA512 f748fc531172a151b25e5941257e60700a42ca222af5f560f35a0576db377d1ec558aaefa3faaf075d511fc8beb1b4f4c46953128a0a04844ad37eed79315324
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20190609-r1.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20190609-r1.ebuild
deleted file mode 100644
index dc3b502a8751..000000000000
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mutt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mutt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mysql/Manifest b/sec-policy/selinux-mysql/Manifest
index 4028438f06ed..5b5220ad69e0 100644
--- a/sec-policy/selinux-mysql/Manifest
+++ b/sec-policy/selinux-mysql/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-mysql-2.20190609-r1.ebuild 277 BLAKE2B 729c94a3d79deda2cf1adbb328d93389aa795ecde0a47e466cf485dfb417dcef351341c558353b3b2be27d036add93bf71038d068b779b41e30a7692a4d6e1e7 SHA512 c28302ef492b0b1dd67a7394cc1d831e2ae52df4a71597fb2018c1f64e1ce007677bf44fb1fbd8a05abe7b5378303a3d8aadf4901e928fc2001dd84997f29189
 EBUILD selinux-mysql-2.20200818-r2.ebuild 277 BLAKE2B f5b14abd620ecef190c4e625cafaa9c779e0ada147061d6048307b219e0337153b41eaba627ee3ad3e1c52563d499bb299a1ee51c9540a08a4fdb0023630affc SHA512 c5d5049ece89445943fca18e8f196b87a90a45dafce665fb30c5068bb3e71edb12cab91f881800e852089ce0cefb72e627ad173375ae39d31bc09610a703a10c
 EBUILD selinux-mysql-9999.ebuild 279 BLAKE2B a2cceb18fccf31a9eb2c989212c807d7e49aacd8d20efc74b0683cffb68a7d8607957623ec1913ed3efddab687968b8683a75e831c4286fc81cf82f96c7c61b6 SHA512 7af4e7e7fd2cd9af69d8958007c21ba31f2d6703e3e607f53c9d86a4666f32289a6502ce0d51da9f00efd9ff04c5d93b5f008d8ea9a1887c543038e7a49b8a6f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20190609-r1.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20190609-r1.ebuild
deleted file mode 100644
index 33ccf44eae23..000000000000
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mysql"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mysql"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nagios/Manifest b/sec-policy/selinux-nagios/Manifest
index 71e5a6d1b19a..8fe4777aa33b 100644
--- a/sec-policy/selinux-nagios/Manifest
+++ b/sec-policy/selinux-nagios/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-nagios-2.20190609-r1.ebuild 375 BLAKE2B e260921af3335c61ac0a3bcf637a2d8adba7f1be487fbf4e0fec5450db4d08c56658c94a79430d533a5a7cc52c0ef58702e0fb6a78327ebdd2c6cf6916b19eb1 SHA512 fd1994ff7418b42223556f506660982d081bef928d1e34d3271af67b310d14383588f4afcb1d157b4417d96333c2c6ced88c0127f6405039677dc2733c699ecf
 EBUILD selinux-nagios-2.20200818-r2.ebuild 375 BLAKE2B 048800cb45cd6ba6aad04346bbaca7dbb2b3f209c2f7ea2c5cf401513d1fb66aae0ea7be9661c5b097ffc29e2547bfeefa6d35cb143eff7957a163a9c42cb1f0 SHA512 1cc805eb8dee6074ed2007c8acbb784af9fa0187556613bd6a2a9e4a57489f8b71a46c38f21ba6cf0d53a790b9fa0b116021ca65329c0623c9d6d0cc93fd5b33
 EBUILD selinux-nagios-9999.ebuild 377 BLAKE2B 427888e6204852597792c8b25c363ccb94c2a843b939d7517e774eef9914d0f14e9aa08f8b795126bba38d64b783e54ac032be2afe0659409b56611620a311e7 SHA512 c35d6c3b591dcc9a1e41ae82858149c99916638a689bdd253ac1d7f4b87ee84065d79381447e2a00d8986c09dfcb919f22dd5d613b9bba4c924eebb489158edd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20190609-r1.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20190609-r1.ebuild
deleted file mode 100644
index f4bf6669fef0..000000000000
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nagios"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nagios"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-ncftool/Manifest b/sec-policy/selinux-ncftool/Manifest
index 762451b96f86..ffddd1971376 100644
--- a/sec-policy/selinux-ncftool/Manifest
+++ b/sec-policy/selinux-ncftool/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-ncftool-2.20190609-r1.ebuild 281 BLAKE2B e54aea88b7d35a737ecc7b4489abee893d90cbe694f984ff58c0f8831fee4478dcacbca79c58435db2f7917dedf8b2d25768f2adc23f6d687c4763160c78d743 SHA512 8b89f2898d680a59aaf806d95878d042b693f8548d6663e2629a65f43c8d3b95045bb968a305ceb7a8ed11089b78eff81a5e43ebb58826a8d84bdf9d0a3d54b0
 EBUILD selinux-ncftool-2.20200818-r2.ebuild 281 BLAKE2B 93b5857002bf3c6af45e9d478da9fd5aaeb71192fc21c04c5335b877902407e4c5ee534cebf09f5247cd0f2381feb1ccb7bccc3c142f7dd1847a156cd7479381 SHA512 a351fabf73e24e192b48349e577b4936f6f6386940c3d082a7d3b46340612a3e49f944ca7fcbb762ba231386b22ff8c10d3cf108e8d5b4f59c5189b0f03c798a
 EBUILD selinux-ncftool-9999.ebuild 283 BLAKE2B fc46fde2ed4785e066fa5c1f5ce0812be0873879aca4c5b879664fd038a3508e65106ce533a99a7fb6cd52e33c5a0297dbe8ac964491086dcd2b5db882aa8028 SHA512 17f720051621a87f11d0287d87538ad967fe95dabc18720e213f163dbaccabf391827a2715650ac50fe1cde282734508b3204a1c0717fba1832a08ce0bdcce20
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20190609-r1.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20190609-r1.ebuild
deleted file mode 100644
index 6dca146d3481..000000000000
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ncftool"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ncftool"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-networkmanager/Manifest b/sec-policy/selinux-networkmanager/Manifest
index 7ff51026f4b2..6f9653d14906 100644
--- a/sec-policy/selinux-networkmanager/Manifest
+++ b/sec-policy/selinux-networkmanager/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-networkmanager-2.20190609-r1.ebuild 295 BLAKE2B 16c2b045b18b128e4c9127045c1337ed5fd3d29f6e043d667d80cd052a4dfdd0003b23c6753f0090c607c4ce00c087d5003c265531f840f342f2cba65a3403ef SHA512 8effa9351798d54e559d3d61d22bd96aebe81062cc26c70ef23f8031551fb3b8491c99ffa862baf987c781c067de6059e2995f46a2c211153de81a1e313c94f9
 EBUILD selinux-networkmanager-2.20200818-r2.ebuild 295 BLAKE2B b9de6932eea9d0ad9b9f3dddadce22c81ea9d0557421b0b5930d389616d4073bd30b797c7d3f6771b58113b8feff9de579d52162e6a283f1fad601eabb1b0829 SHA512 20a62a9b786685cdcc3192f6a35782a5778998b034e71a1591462154da778fcd65e89b35e3273299dfc9a5b3365bc8c309a56ad65fa56c7f9f92e3b4bc5b74f4
 EBUILD selinux-networkmanager-9999.ebuild 297 BLAKE2B 535d96b2615cfa772333ad9274fb296841cff3828f9914705106d328c23ff25ebe24c1df8b031a6da11ca5dec5d0f387eca9871b8e50e45fbfd9120a67803aaf SHA512 1327248650b1c218dead01f9387fcd460321e9312d3c6813ad0766fab0f14e0ea40d0f34ecc92e8472b18109b04a6fef9ad5268bffa5ec4fdb7c017c686cbfde
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20190609-r1.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20190609-r1.ebuild
deleted file mode 100644
index e45cea85c0e8..000000000000
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="networkmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for networkmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nginx/Manifest b/sec-policy/selinux-nginx/Manifest
index 28d544d4e110..938790a9c78e 100644
--- a/sec-policy/selinux-nginx/Manifest
+++ b/sec-policy/selinux-nginx/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-nginx-2.20190609-r1.ebuild 372 BLAKE2B 80e25ee56b95a2d97f89ead571a83287e7597bded5e1b67ae89083e4355fbbde085150f1ea77e158ef67b7511804205412db4ace86d9580aa6e522bf90a617b8 SHA512 69dcf6b1807c39173c14c232222f03b6b83de03566a652cfb80faa29c44ddffa1e2db8df5fcefba97670a635f93ebab1226bfd863fa87379c5a9a89f62f97636
 EBUILD selinux-nginx-2.20200818-r2.ebuild 372 BLAKE2B 385fb0576401ddc4575a57b6117612011639dcb797fb1789b30725d90f049822859def5f64dcf888d3ad3621c97a4cf9680833c4bfd4f8e4570684b3e2b3f413 SHA512 5cd1c5eb9f9714bbce58a312b6c3c51bb17f992099e473b6274afe13eb97da8dcd3df3a40540cd4fea7734c1962e1c7a92bea353c525ad381567bb4c46883136
 EBUILD selinux-nginx-9999.ebuild 374 BLAKE2B 2d38b30a7fa0bb51dee3b2b2b06ff5793c4f9b52a25d1812d5b4e4db1b4357a49959e5545c40af94aa3417859295a856c7fee9da0d222779a412656557416239 SHA512 b39a51154e5a9b49124bb4f783e21216911b9795cbf41db00b1f596ea3a7acb5d0c6dd7e7249b9f8e5dbf6721485e3a3a90d8ef44e7cdc1d799e67ede32645c0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20190609-r1.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20190609-r1.ebuild
deleted file mode 100644
index 2d6fbf714ba6..000000000000
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nginx"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nginx"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nslcd/Manifest b/sec-policy/selinux-nslcd/Manifest
index 4daaa22895d6..6c137b635b62 100644
--- a/sec-policy/selinux-nslcd/Manifest
+++ b/sec-policy/selinux-nslcd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-nslcd-2.20190609-r1.ebuild 277 BLAKE2B b3f7412f595ddd4ae23c9e99fe30bdae2d2108337343f23ecb3faeffe40e1d2068207de23224facb5c4538b59a35d127ed1bfd69aa71d2a73192103f0f34487a SHA512 64b37d57301730da0c7fa926406dcf23c93c409e63bce76abd0f64ab251b6feaf0c134fb08e72f3e26910e755f1eded0854233bf7013adb98f745f217e974d14
 EBUILD selinux-nslcd-2.20200818-r2.ebuild 277 BLAKE2B 071996d0b175f008286d9e4056f5e1a16ec5508acfbba6dbbcab552a6bb1cdb7c0fb8e3736a341facf42b6ad28f765b8eb091191bf552376c2c88c108e765712 SHA512 4d23410b876cf5c40d36bde9a9c03092d57d2d72d8fa47a9f9f47bfa32140ac45387c861de2a2b544500a1c1e04de69ce0fb5b5622e95e0b6de15f1cd391bf6b
 EBUILD selinux-nslcd-9999.ebuild 279 BLAKE2B 57a61614f8d475e78c555a6d52fcbbd664978c485b66afe898470a8918d0acd78c0b9807d057e43f5b1ac05d9b4061ffa827047d89156a224d7c15f59a02fff1 SHA512 62fa16e9a85e07da9e34497be61d12311dc15c69dd0b0b4fec4e84b2f8829b20339a5fc5cc74751a6431e2f206eccdca85124d78804c68d285284551958bfd46
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20190609-r1.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20190609-r1.ebuild
deleted file mode 100644
index 0b5f03ae48ec..000000000000
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nslcd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nslcd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ntop/Manifest b/sec-policy/selinux-ntop/Manifest
index 9440c4385caf..579806a9c1f4 100644
--- a/sec-policy/selinux-ntop/Manifest
+++ b/sec-policy/selinux-ntop/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-ntop-2.20190609-r1.ebuild 275 BLAKE2B e53e56ac1c2dbf65a490c075169f9ca33516d9938750a28d6e1c3557604c5b7fba84eec4f1925a5ed6876e18b5b39d51bdede8317eefd839afabfcc309b953ed SHA512 137db26521c5851ff374a1a7153cc726af5a52bca9c3457731cbf1c1a8e8c43ee47b4a5487e621d32b0f624603262ee46a077fb37985e2c7eebaad4979a40e46
 EBUILD selinux-ntop-2.20200818-r2.ebuild 275 BLAKE2B f767bc539f5edc0113523f30576e61b450292226862ddde04267d0a9e27a322f0593f345909b3821702f25e35bf45403c417e4186d5ced461b40513958e7320a SHA512 1ae855d5233fb9d7ae430e1e9b0582ae992aea4f99082da90993eed7a9b6a0d91ce278375bd1f382428cb6e9ad136960c94227fb417071afd6d95ea3b5214797
 EBUILD selinux-ntop-9999.ebuild 277 BLAKE2B 0585e2e0dbf797a4defe8110a4665c70344b82eef0d4b32b7af2da6a40cf042a470f7716b0a19deafbfc991c4eb2af57b084864482f0a19fc8e94e055d5ce351 SHA512 bdd8244dfdc70de98cd57ade940ea7e54d1da6a40cf4e1ad127ef54308e50e45a5f141a1bb98f239f6097f821e7b12732b6ad07d9503222d8ee986d7779c141b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20190609-r1.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20190609-r1.ebuild
deleted file mode 100644
index 62cf12119e3b..000000000000
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ntop"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ntop"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ntp/Manifest b/sec-policy/selinux-ntp/Manifest
index 5a968d54fcda..1205961f69ea 100644
--- a/sec-policy/selinux-ntp/Manifest
+++ b/sec-policy/selinux-ntp/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-ntp-2.20190609-r1.ebuild 273 BLAKE2B c12dea9012d50b1d4cc587c284d56e380844cf78dfeaba9d92883af1c15746efbaf800fff59e31a9b277c347be23d857f618c43892fff65af7e3c355c69e291c SHA512 fbc5a963048599a51d1b2c1fff79dd7009276bb8132faa98bf0a73c93403b948918f8ed346baf84a576ea2226df99d323fecb047b7a9138902db2c4cecafd38f
 EBUILD selinux-ntp-2.20200818-r2.ebuild 273 BLAKE2B fd69529c9b211ba49fb3df0f0d1302ecb267f887cfcb5502698e8705879b5c7d43c68d73715f5517fe9ea6ef3114c80d5098946dd26a74d69d97553c45ffabe5 SHA512 b1c7c92a56c0ec0d5d4b08846d280dbf7bba2adffe63e55b14c51d1a1fb6bdfaed567379bde939ed31c9d86d1c9b914af3aec68e7189299bcc2b11e94ece57d7
 EBUILD selinux-ntp-9999.ebuild 275 BLAKE2B e32ac54b961081b2dd3aa285abed7da706e0d40eb022dcf66c65afcc4a68de6e9ad8fa08cea91dc5287b58cd8966c1b4552b2fdf5c1bb89f597e80238c801062 SHA512 939509e9444d0ff0667b75940b9a0c319c2ac18e87a8de66f6eeaf3bffb6a2b6e838bac1f51b4155f37564ed5c9d906cf3d825499d55ed9d5b14b6e441c7d4d0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20190609-r1.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20190609-r1.ebuild
deleted file mode 100644
index b40a9d17b4f5..000000000000
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ntp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ntp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nut/Manifest b/sec-policy/selinux-nut/Manifest
index 3021633220e1..5e9ad9b78028 100644
--- a/sec-policy/selinux-nut/Manifest
+++ b/sec-policy/selinux-nut/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-nut-2.20190609-r1.ebuild 369 BLAKE2B 0550f096ac246525412f676b7ecffce720ccaa75434d71ec06aa14ada19816711c7f3aeb87fa7704701ea13bb66717078a82b5f31ab72f731d2406ff502e7778 SHA512 3402b4a8ed58b61fc25f91068b044736dbbe533addcd2f0e24cef2be3223644490c0bad1e589eed38813f74224b1ad5c742d0f04c79065b680113d2b6a16f411
 EBUILD selinux-nut-2.20200818-r2.ebuild 369 BLAKE2B ce5335fbc51ee22980bf7bce39d22c7dcd16b174355171527177af19fa81ec55725940da631606ca8cd5a0317eb6044142358bd0237f9111fced2efaccd0cc28 SHA512 96f7049d4c21fe7e6df004f90e9c2aac045e110c9e659a5ebbb8b06eb498b695c1383ec8200b26ef3fd7219730a6b226619fd1fcfcb0cc304f62a3ad72df34ce
 EBUILD selinux-nut-9999.ebuild 371 BLAKE2B 399042f8ba5aefda743bf4a388fd7918a250f1811c0276f3558d41316c9c29371314cd0bfa347c4cd5ace027d0d31d4859ab7e3a1046d067949152a5e4d363cc SHA512 05ea4746218145c5119c6382247e17f6f7452701a393e5d1ab5b375afd35854a22267892ad77f4b140f39b47c94a1e2e12b2060a97705341dea67641bdc506fa
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20190609-r1.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20190609-r1.ebuild
deleted file mode 100644
index 83b6df01523b..000000000000
--- a/sec-policy/selinux-nut/selinux-nut-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nut"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nx/Manifest b/sec-policy/selinux-nx/Manifest
index e81669296d7c..98c917db2b9f 100644
--- a/sec-policy/selinux-nx/Manifest
+++ b/sec-policy/selinux-nx/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-nx-2.20190609-r1.ebuild 271 BLAKE2B 1b35de5c859ed15b79ace55734abf5eac91ec6baa5c5ec53308de93cb2b9ed38b5301b9269b5681f764dd9aa54c1e57bafec88264cd5b4c9c2dcb3d9a28a01a3 SHA512 5b6ec86e65c81992eb4c450149921c7c4137eff84f04e53f0ff8105f703bb997b40e4c77789ad9e8c7c6a38ee41f071dd4414e056e0d13b5c45d1cc116dbd445
 EBUILD selinux-nx-2.20200818-r2.ebuild 271 BLAKE2B 51524f359839f29fbd2b86a61348d84e211c14ff1588d792cf2aae75178e753627b93486e4f1563d1cd1eb9d31e6cdf08f48b2e7f25dc5c10e3c0d7ad117bb80 SHA512 2c69d99f1695dee10cc8d81debc6de05a4076b547776edd1a33f79d2f0c297a1ce592cc96e549c9caf424b4e471f5e12375c6e43ebeb1bed46beeef56d9ac0e3
 EBUILD selinux-nx-9999.ebuild 273 BLAKE2B 7bffd9f08ac6652f4c9ae8c31b3b30f8682399faa583f25c6a7f9bb1fc9f923fd1f003143f80a3db1012bd0fac56d6beeec180c8d4d23c61a87f8b78043f96da SHA512 b9313a511b2c5d7add0f8d5deb1f822e7072c667dc2d15a67a8582371a77175c82e7c470fec8ffe502bcd00e13c0731ef175f3f7013777cf85f6547c0d5f6a34
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20190609-r1.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20190609-r1.ebuild
deleted file mode 100644
index c4778537359d..000000000000
--- a/sec-policy/selinux-nx/selinux-nx-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nx"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nx"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-oddjob/Manifest b/sec-policy/selinux-oddjob/Manifest
index e078402f40f7..5f90eda99115 100644
--- a/sec-policy/selinux-oddjob/Manifest
+++ b/sec-policy/selinux-oddjob/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-oddjob-2.20190609-r1.ebuild 279 BLAKE2B 44fc11143f580f02f1c1abe7f7730a5a696c05a30f5f1b8618caa3e8c131b28bbf14ad78db373ddfec7cba7f862a8678ddd3a5896c86bd939758bef9bb4c6087 SHA512 fd8d57586f957e4b328230ef18e4af4e6e491e23c14dd28866afc5f27bf258f9b8c2f11ba0ab5977f9deac3212086bb2e915a9452679c612b2bfaf8c4b2c725d
 EBUILD selinux-oddjob-2.20200818-r2.ebuild 279 BLAKE2B ba04ad70840cd3ce9bddbfb3ce7ae6ee38eec84d5e73d3db5b99ec8af5a322657e61b5a1a33b6797fd6866a1b6ba4f1d933f0c303de6d43f2c244139e0ecc9cc SHA512 f29f7db5d4fe3b0afd3c36f0f60535fa77a38a37d5275de86af252112d4fb9cec027ebe7700bca6fd4733d453db5725adab58490b4086a94a9cb51dbb3043e75
 EBUILD selinux-oddjob-9999.ebuild 281 BLAKE2B b1c3d5bbe81c220dc9d9bf9e36cf705afe875f5129734115a54407a5ad102476d519e745c0decdeb0d74f9041612e125f648061c06e7a81c98d5adc91ff88d3e SHA512 710ad4b27bd97d4248de419c9c77e7a64d4b757d73f8f54fca00d2e91aab7fe4ad8e67604973ee3acb179f9418c188345cf4d80c5fcf1ec12b7119407acb6017
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20190609-r1.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20190609-r1.ebuild
deleted file mode 100644
index 504ae44fe9a2..000000000000
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="oddjob"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oddjob"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-oident/Manifest b/sec-policy/selinux-oident/Manifest
index cc19867e3ddd..02de0776b1ca 100644
--- a/sec-policy/selinux-oident/Manifest
+++ b/sec-policy/selinux-oident/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-oident-2.20190609-r1.ebuild 279 BLAKE2B 759f3ad4d9b574d8b64804bbacfe5ed30a63fdce5b20a6ce99a1f0dd85d2bc797e817f351fcebcdabeb81814b1444d5d8f088dd32c8ee6b2cf98875da84d2a5c SHA512 10d21b8bdfedb7fbf38edd74e11e4b6fa6e7a7a6cf4355587a643a902f6d7636d319262f25b4cfded41a4771f5059e82858889a43eabb4c1097a5f30e457fe6e
 EBUILD selinux-oident-2.20200818-r2.ebuild 279 BLAKE2B 32ec04da59ebd16b9c385827ddb8e0ab2f9e959bec6766f4002ceac68c5588192644dca9601e4e879c3754e7d16adb0a525c481169ee3b71f8f062dffe68abdb SHA512 b94c867632e7efded41643ce3130bc241b60a8b9741dd093375f1a7ddc75099ccff0e7265c9cad337ed4dc11f4e3789812fba90f88e74402f91b63b45863d81e
 EBUILD selinux-oident-9999.ebuild 281 BLAKE2B 3f38477320f0b1bb82ec0b49a1214f078689be316a387cf6dd51d5f7c72558f089ed88fc29d79fe6a177d0646a971ca1c3995caef7fe4642aac39ab61afd5c47 SHA512 aca6d7fce9e283381b4109018091f4cecc92e4aa8916a0f50c37dec918dadf9c43c2065f58188da4289c67b6c3503b57f46148a28fa2ab95351a48104e1ecff0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20190609-r1.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20190609-r1.ebuild
deleted file mode 100644
index 863e0f5420bf..000000000000
--- a/sec-policy/selinux-oident/selinux-oident-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="oident"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oident"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openct/Manifest b/sec-policy/selinux-openct/Manifest
index 8869d676daf2..fb18886efa07 100644
--- a/sec-policy/selinux-openct/Manifest
+++ b/sec-policy/selinux-openct/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-openct-2.20190609-r1.ebuild 279 BLAKE2B 7a2cb7239cd30fd655d1fafe209ddb38cff91e8b50e9de55f8be77faabd22d283e4b16e4a4b36ad9a1b6153088c3a029c26c4abb57e77bb9229a5d84b569ad7e SHA512 b98cd435513152795b4459d547b01ea6fdc54341107916b7ef14f707386ba9a5be518e4fb340c71f214aeb37b49a0f8758e70de929442766f73164206fe374e3
 EBUILD selinux-openct-2.20200818-r2.ebuild 279 BLAKE2B 152ba4db14a8f4c2fbd1fb6f2d8f8b32e8bce3f02aa8f794601573883c476c0f4348e92d92ac1299ed32c120d643d2f2bd8288dce60efb372e2e8fcd1de6d1e4 SHA512 11a20c9d7672cef3169021d940dae08e98c6dfb62382e38cdba4d3c22bf8489da63a91094b53e50c8de50b34b7dd00bb069c9ea7d24f32a89cfc5b1009ce4bcd
 EBUILD selinux-openct-9999.ebuild 281 BLAKE2B 55304d7725fd79fad77d1539706d9235cc06c09d2a29029a82d755744414ff1811316e64d22eaea787cbfec3dd34bc6550db4adbe23ee3b704f275048207faf7 SHA512 7e5064ac60b1e9b881448ec701a9acdfb2556aba6e1a055c639e029527e1b9151dacafdc8771fbb381d0e5b28d8885a9d049a41a7ddc15a01f206e75f98f1aed
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20190609-r1.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20190609-r1.ebuild
deleted file mode 100644
index fcced3021952..000000000000
--- a/sec-policy/selinux-openct/selinux-openct-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openct"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openct"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openrc/Manifest b/sec-policy/selinux-openrc/Manifest
index 251aa027dbd4..4787dce5dca4 100644
--- a/sec-policy/selinux-openrc/Manifest
+++ b/sec-policy/selinux-openrc/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-openrc-2.20190609-r1.ebuild 279 BLAKE2B a449236e20a9fa1dbbfc56e801e65d0297768b4b2b3e1baa71ee7e8a43157b73c76e2afa5efaa4fb29fc6a1c72b99ea7a08ebb6ca67528fb370e37fb352dbc9b SHA512 8200500eb0253b1b643622cb3fb3055681d838b68d067ac0b97cdd8d31be52891e3fa0a0fd158d2aa52d40b3e64caf1b224fc47e3abdd544db412f2997b6078d
 EBUILD selinux-openrc-2.20200818-r2.ebuild 279 BLAKE2B c5a560ab641f12316e83588afc3bed31cebc741a1898e13cdae0cdb0cc9ea8345106dcfc77b6c9e20c6b1c047cac7cd59e52781b110ec62a283e081b5547f7d7 SHA512 c10a51155dcba8b2dbee98331fdcfa46ef9a82b12e480ac2bbfc1bc61974be6d76ad189c9c8e46531e2d38792812196eedbd057dd005be0320e29d553afa0f3d
 EBUILD selinux-openrc-9999.ebuild 281 BLAKE2B 27674567eac583e2260cbd192b51274e515da426e500b3ae51910ff5ad0813ac035170f6d40250ba96f8afab4bc0da6b1b2d1ca2c802cd7a77002e1eb774780f SHA512 22d1585d3b73a57a6eb97c401058ab5d3a85c6b893292cbf74838e67223455cea475f71abd472368df35b3f1c35f435b33235fbab07bf479bdd7e853272dc563
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20190609-r1.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20190609-r1.ebuild
deleted file mode 100644
index 44f108d670a2..000000000000
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openrc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openrc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openvpn/Manifest b/sec-policy/selinux-openvpn/Manifest
index bd130af7a46a..1deaeadf3e02 100644
--- a/sec-policy/selinux-openvpn/Manifest
+++ b/sec-policy/selinux-openvpn/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-openvpn-2.20190609-r1.ebuild 281 BLAKE2B 3901343914a202fc70b486f548eac099cce66db5f4d311fbdcae92864619588fa98e86da01c22b710ee97e85228e769db497686c56a673992392626165f138b1 SHA512 91ef7e7ab0d229f1d345e2ca3849341518ce02d46a9b4e31f1b477a08454c1d5f57adb34e7fbe0ac71e9af11649a231eb15c5901dfe5bbf7a9603b38d14db23a
 EBUILD selinux-openvpn-2.20200818-r2.ebuild 281 BLAKE2B 3b47a3210de8fbddd6e73ed8d39952095e004c7a0e90746504e7cc586e7fa2e9f113c465b1025d8678cab0971c00d345c820140599760bcc04b1bacafe1299fb SHA512 e44f691e46a92aa17fc0ad0b9bc6b7613136ca3792c0a907ba787acf6f573c608f067ba6e4f336ba06010b82651567d95d42d242cce9b6615f17ea3fc87f122f
 EBUILD selinux-openvpn-9999.ebuild 283 BLAKE2B ac0a6d1f23a9cb0006aca419a9a2938035a01ce95ba40f18e5c330f5150a1e3240e7176b6accb2dd734dfd92c788050b84e3e54b61939e1e3f2eb66b7e14d0fb SHA512 88548765a8f9b91595255d11a31801d03a205cd3121b1de461592bef8b2c43a8abb6e3b0310ec68f9bb223e0974b07714a33aed88dbd18c84803ff30525e1b13
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20190609-r1.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20190609-r1.ebuild
deleted file mode 100644
index ef1d67bb9881..000000000000
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openvpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openvpn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pan/Manifest b/sec-policy/selinux-pan/Manifest
index c183b3a6faf0..1421b75ab204 100644
--- a/sec-policy/selinux-pan/Manifest
+++ b/sec-policy/selinux-pan/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-pan-2.20190609-r1.ebuild 371 BLAKE2B 02c3cfd92d4e428f1a938bf2eb48fb4b9bf2e9abe07e46a389bb0111d415877e5883d88cbb426f9bfd7ef221074fc1f541353f265704a6e33d06af3f023bf2cb SHA512 589774156f482267066ce616f33b69880a9ac44de8d881ad2bcde80c87e969912e09e4eaeb5b87611106d68a8b8f08c823f1c6e90820ad058b1f032ede3064fd
 EBUILD selinux-pan-2.20200818-r2.ebuild 371 BLAKE2B 30ec05241cc74a2360bb21a579d1b28bc7fcab44ece47b330d3260959b7ed48b5691678170a8b5dc9a1f80f44525d387016b8b60d756af526047c98444363c84 SHA512 506703f1861acdc25f9a1df1e3328d89f1c4aee96b0df181cfbeafecedae228c8d3c76a38c38a3ca34b9149398e8341a87b68e8051eb267c8a0eb8d21320c4f2
 EBUILD selinux-pan-9999.ebuild 373 BLAKE2B a2923b44179d22a9a5280b7a4903add6e43dc066fc812c398c25ed8f2bd404b8ced66397a764c7e6c0bc5b0a8b5d1add5ddb9c26afe6a720f0f2bebf4db8fb9d SHA512 58f2aefaa99d920fa1acb5f0b814023bbcf54c2c8f9efb1ae63e379571cd5cd7de6a421b747fd40aedd366b0081f68f2d8ef40c178aec2e5c1504777362e07d7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20190609-r1.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20190609-r1.ebuild
deleted file mode 100644
index 80eb12670a63..000000000000
--- a/sec-policy/selinux-pan/selinux-pan-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pan"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pan"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-pcmcia/Manifest b/sec-policy/selinux-pcmcia/Manifest
index 1948e1498a97..baa9901cf6f3 100644
--- a/sec-policy/selinux-pcmcia/Manifest
+++ b/sec-policy/selinux-pcmcia/Manifest
@@ -1,8 +1,4 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-pcmcia-2.20190609-r1.ebuild 279 BLAKE2B 80d1c9c4391cc95929fca29942d85cfddbc1ac34c52516d4031b3d3500a95dad19830f2ba13738736ba9e73bc09463a7898734c7d1e7bb8bc89cc1ea02ef52ea SHA512 fe8df27652623af74dd091a2ae39c81ed67ec2285bf7bcaa70087bceca14beedfc5b04a380831156106e0d4442c60ed357ac7215b98cd4105687aa21e707639c
 EBUILD selinux-pcmcia-2.20200818-r2.ebuild 279 BLAKE2B 475135c8840e7286aba38e6f481ee9dcc4da1358e03e684fa6190f9401fa72bdf8ca65635fb886f111f7d57391242f3e0bfcd127c257ed002e6f54c79a7c7aca SHA512 185eb53e1736ff184792c9dfec30329f91c8adf275b50914f49bb5443b8ea1280653a705c1ec613f96d155754b2ec8f754b4408b2bf0d416d6652da105da84d5
-EBUILD selinux-pcmcia-9999.ebuild 281 BLAKE2B 9b271e27faa462e90219b230e79256ecb3d28ff0eafddde38db741f5be1657f68ec605ef992c49d5a2e1b5a9ca3d745e904e95fe412aceb1d84462b9e16d68ec SHA512 19d62a330b9a2a3e9e5845148ba053694d463c5b502a41d3f0e6a01b89310d253c327137efe0125c1c0184d8839346ee4b39f107479c96a0431edd05d5537c97
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20190609-r1.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20190609-r1.ebuild
deleted file mode 100644
index d8101a720a87..000000000000
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pcmcia"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcmcia"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-9999.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-9999.ebuild
deleted file mode 100644
index 6af86c698493..000000000000
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-9999.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-IUSE=""
-MODS="pcmcia"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcmcia"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-pcscd/Manifest b/sec-policy/selinux-pcscd/Manifest
index a3969e711604..e0fc0d950ba6 100644
--- a/sec-policy/selinux-pcscd/Manifest
+++ b/sec-policy/selinux-pcscd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-pcscd-2.20190609-r1.ebuild 277 BLAKE2B 14af72f07e1b2d4a35080888afd938f1589e0aaecb161c99dfc8d23d75c3d823d675400bde8cb08b3bf787b3f679d3c7b799a8b29c8c6eb0af4b4bce76773066 SHA512 7af60c0e5d444be8883d7ef4ab016e2aff7441ad7f7991e4c92f55a77d967ed6f5999328c00f8c3e6955663cf115dfe82f8a1d18a8aca8b49e6e27abca570d9c
 EBUILD selinux-pcscd-2.20200818-r2.ebuild 277 BLAKE2B 5c549fed009e6d318c4897d436b5a832eaee6ba6282c77ba3948983b1ea4545a3cf477ca1dfc6e1f33efe00c0188f172e9d9aed865c07c5b916e625900eabcac SHA512 f5a37490dc118ea1bb48eacd3367574d4a4cae950310d6757563f8736bc01fa753a7efd3e9eb7d2f9462cb3688d130fb4e90266b2a9b6e52c4120590f91099f8
 EBUILD selinux-pcscd-9999.ebuild 279 BLAKE2B 43ef65d57f1e97010c3eb8d5ae8efa037c49d93a52cd9509a2a5a33e40c75c49857c07069626aa7153e21a6fdd8fb2380ce8d073f3a99c1c5726e2bddfbca7d2 SHA512 d68568ef68c104dd1e719865dcbbe27bc86e0ff19170713212b1f343bcbe8aa8c3d15ebc69e8bcbffd79732eb6be7f02af28ef99344c506f6d9cde146eb1b0bd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20190609-r1.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20190609-r1.ebuild
deleted file mode 100644
index 4acb66f5c9db..000000000000
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pcscd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcscd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-phpfpm/Manifest b/sec-policy/selinux-phpfpm/Manifest
index 16c473bca16e..1941d9e77d3d 100644
--- a/sec-policy/selinux-phpfpm/Manifest
+++ b/sec-policy/selinux-phpfpm/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-phpfpm-2.20190609-r1.ebuild 375 BLAKE2B 089da64a70fbac8ac9d501782b1461bf0d96315719fdd6ad2c2907c07ac2d0cef52923e5844cdfca64caee95b7606bbe6e303c8d479ae1ddfdb3fbe40b3dfc7d SHA512 6d5ce0f583744237ffd5046672ff00fe0faed7775b4f457d1d1587a7d372141e4232b0b7176474365d5fc6d9d707cd779c66af3c4de548b884088b46d6440817
 EBUILD selinux-phpfpm-2.20200818-r2.ebuild 375 BLAKE2B b913329ceede1989051c90cd8bd7e6d8d5564710f68fd16f29dd6b2f30e579bd9c5a57e0bec40d82cf1b7fb43952587e7da4f53c52d84849c9ac50a1e35164f0 SHA512 712a204ab6227bfcb2640dce83c231b35306188ce9eb4654a4a5adf1cf740f29a0e36703ae2f670417c5833eae1680a3748af1eb90d79b7b30bd5e985cc64c77
 EBUILD selinux-phpfpm-9999.ebuild 377 BLAKE2B 73dc9463ce53308a10cb38d652af9d64c84e07321b2c0db15635906a9458ec8ec855b08cae77d810f32bc7ba515ecf0e0289e6f8ce24bc5321f5ae23e453150c SHA512 5b6ba8c43a33cb0cd29b07ed50dfe8cccf2140bd23b585b0e706349964431d38a1a2d21a48bb14e36a5fe6f238053d879bd17ed1e55d956036db70bfbcb390bd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190609-r1.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190609-r1.ebuild
deleted file mode 100644
index 495a799ebde2..000000000000
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="phpfpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for phpfpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-plymouthd/Manifest b/sec-policy/selinux-plymouthd/Manifest
index 6897e40c37dd..786acbcc021a 100644
--- a/sec-policy/selinux-plymouthd/Manifest
+++ b/sec-policy/selinux-plymouthd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-plymouthd-2.20190609-r1.ebuild 285 BLAKE2B 58282aa8ea562e0d1bdc510a3cc5f80bb218d7d6b06e9c917ce282ca89cd9cfc1d7a1c45aac10913dbccf79c4d61b0848c75514a5730aee9d24233030a51b504 SHA512 f81ed583586eea182fc97f99f170e5d6534b9dc029e388dbb9c610fe178ff18d2c5cca8e944ebd9b06f8e53fdbfd9bbdbfa40c565be3b29028087b89e43e3fe5
 EBUILD selinux-plymouthd-2.20200818-r2.ebuild 285 BLAKE2B 746652c9d5443c8f808c0789550d9f1e7d0361f3d1153c2bc416a0c7711d111b5f93f98e5da9c39f6273dd272a30f77cccf6aed1214682ae91fde0ad41516af5 SHA512 dabe5a014e6ef65fa22260c7abff524269b7a290143840d9f23df06e1899c6383079275ce0a22bf800a49b02bf4406a48c73169be953969a07759c17cc5bbd58
 EBUILD selinux-plymouthd-9999.ebuild 287 BLAKE2B 9ba71fb3b53f95cf1df2bd1aee6e4ba4094a7a8805286403f15c3e25fa3804c5a23ff90ecde0bf5b499c5e2700c97e7fdf06f74cef50b3e4e12e8d08bc4d5008 SHA512 7e6f7383ed0e2f37b1d9c2b0d707e5466b847c9195f75516acca973432b1aad6665e5f98ebbce97c4017fc7ee460ef17aa25d27c140037e845b1048c79f90a07
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20190609-r1.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20190609-r1.ebuild
deleted file mode 100644
index 4d55cda939ad..000000000000
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="plymouthd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for plymouthd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-podsleuth/Manifest b/sec-policy/selinux-podsleuth/Manifest
index 5683e6ddfd2c..5e9bb22b3937 100644
--- a/sec-policy/selinux-podsleuth/Manifest
+++ b/sec-policy/selinux-podsleuth/Manifest
@@ -1,8 +1,4 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-podsleuth-2.20190609-r1.ebuild 285 BLAKE2B fb843da9deaff224e99f07a7cde58c27ec0951038b765d9ddb260fc4c9be9a71a87fb9535139b512c028183e8deff881294c97aaf99b4b7157be693ba46c7933 SHA512 fcdee43eacc756d0be5b911c080c923f630a605e4de3721e92ffdfe22539497a2493640ddcd21c373a4eaa50361193118f37c4cc60496907abef189fb4499ffd
 EBUILD selinux-podsleuth-2.20200818-r2.ebuild 285 BLAKE2B 12b8dde5764a350751992aec3744626115022f28aee58e6ea7fd956640332a419856d0f694055e15e1127145a90926c525e375240ec09f8ddc62e47ffde9dcef SHA512 c4fdbec28bc55763e3d3ebac9acbe07556efae84c1d39aa0dd54b52d493cb310a8ce5d619e9b7fa5ce608a4235bd7b33809987c6b31ee6885bf74c69fcf7a37c
-EBUILD selinux-podsleuth-9999.ebuild 287 BLAKE2B 0a190127ac6bcf7325ac9cb7c175943a0cde15df8caa999d1b3022bc15d161e5f7a320b5640530029badcd2a52405bb34acfc460f47698884f4499c1033d3b07 SHA512 dbf436d0942afe5f706770aad0cf10954cbe294fcbd36e6b45a794d864545256aee56c21c8bd6fac4cd1464d0d8a0eb843c92fc134d10cc1bd2351d6a454e7f6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20190609-r1.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20190609-r1.ebuild
deleted file mode 100644
index d1579186954e..000000000000
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="podsleuth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for podsleuth"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-9999.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-9999.ebuild
deleted file mode 100644
index a6b2f452c346..000000000000
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-9999.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-IUSE=""
-MODS="podsleuth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for podsleuth"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-policykit/Manifest b/sec-policy/selinux-policykit/Manifest
index c28a7cb578bc..6f282f20de8f 100644
--- a/sec-policy/selinux-policykit/Manifest
+++ b/sec-policy/selinux-policykit/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-policykit-2.20190609-r1.ebuild 285 BLAKE2B b2980d5d65e9e35f0278625fe2905e9ac2ddae5798e39012ccb07f46b8c179e18262206f35718cd957ccdfd441614ce5194510a2dde545e7dc799d229d196716 SHA512 505f3e842e8339f204659b908eecc27d0bf7f3f23ce1ef8cfb7a18262461e734b653195dd83125f2a676c05d7555c113b9ccba7a7c3a215ee119f0fa36c082f1
 EBUILD selinux-policykit-2.20200818-r2.ebuild 285 BLAKE2B 5c966ba352001f504aeaf3de6a8e5e45306c34d0ef9aafdf8f78f99ae18617d584fe7a08abf08606071dfd8d3a740d772726b092bd1f1977e4cad620d103485c SHA512 004e5861edda257a10b8fb7d80a8a3a97d35b11a34bb53404e4f1a1802f42691620094af06bbe7d9828cc056be62c10e6b53394a9df557bea8377e4c6b1d4a95
 EBUILD selinux-policykit-9999.ebuild 287 BLAKE2B c672ddc43c5b07b8cf108e67790df23d85a7c5f603ebd65a54b889262a2dd0aac0446d4a81791dc875cd6592c166f292556a80e7ea94d3c367986f811ae9d7be SHA512 48c46a49ce7f23fd2a1675d0d85eda7acbb5cb0fbc792f8f3b59c8cd24ac12510455bf70fe8cde2c2f98e3f06692e883e69461f2c1f24f22fdab4bd51f5646a7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20190609-r1.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20190609-r1.ebuild
deleted file mode 100644
index 7a87b59f78d8..000000000000
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="policykit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for policykit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-portmap/Manifest b/sec-policy/selinux-portmap/Manifest
index 945a10bbb0f7..e69d7cb0d484 100644
--- a/sec-policy/selinux-portmap/Manifest
+++ b/sec-policy/selinux-portmap/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-portmap-2.20190609-r1.ebuild 281 BLAKE2B c816423ad8a07d4736795eebda9f19f77ad1d1bb8fda617c41e8ea13acc6402a4ef36a27a0458c4f70b3cf8e1d90d0adc6ba76782d24b6d02a70e15c31021858 SHA512 29fe6804192f82b24b051641484e89c1934298651e0c1d19f0add6caa2f4892e38065ee00550467e1ebcd9f4b83ae6e42c6259b8bc5ef8e9e11c7943da98bd83
 EBUILD selinux-portmap-2.20200818-r2.ebuild 281 BLAKE2B f2e1a5b22e5f1df790b67c6ea0e0d8b7c22e10797235a9f4e9f88a41e618c95ad33e5f47fa24c870073c51cedab14ad35fe0f3a1ba64e7546f08db29ff634f09 SHA512 0ba77a8fece26f06dadfa4a75ec89f8d5fdef52594af99f88d5cc33551f4b887ccbe867233b7d59d413e800043daa307a7c8ab66623b6810ccc717524734f7ea
 EBUILD selinux-portmap-9999.ebuild 283 BLAKE2B ab571318f9df3e66589a9038fdb8f0b9672dca302f8dd4de42be485dc100dedc4df555e1567fd7d21604335296c9acfe984096d5edcc71cfa308de0ccc22bf60 SHA512 c46b4a66ff73957b71e7175fe514c4155f831ec9cfdb0e1d9b7631c98d40bb3a94bfdfc42ccfe09bb94bbcd53154dc6f07e61891a85d2d9cea8842444b1bee16
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20190609-r1.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20190609-r1.ebuild
deleted file mode 100644
index f115867a52e9..000000000000
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="portmap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for portmap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postfix/Manifest b/sec-policy/selinux-postfix/Manifest
index 015976fe42ab..1c0654994d10 100644
--- a/sec-policy/selinux-postfix/Manifest
+++ b/sec-policy/selinux-postfix/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-postfix-2.20190609-r1.ebuild 281 BLAKE2B 9bf98b6e6c89ffca92aa7336763741d66c6b49c1b19eea75a1975e1208a467dd220efa854586ae32808e005d4cdda4482910a5fb2dddebc71508e42ad631e4d0 SHA512 d4807f6291021980087697022b12ef3cf57c857aa271388622a845cdff7f5c9065b0ef5a68e2203646c6b74d10ba980b17f23ca397cb04ac6f96debeeb83fdfd
 EBUILD selinux-postfix-2.20200818-r2.ebuild 281 BLAKE2B 789005134ef3aea40294e1c233bb9c5a0cfa35d8c3b873829ce2c25f8fa991e152d28d29d5c1b0cf62164cad144246188f20f233f6d4039e0248623a0cc4b639 SHA512 baea6b52bca21649257efb6a70e50124778b6237229bae41fc5da2be52f46e85b825e86a06dbe853f301fd468effb84f814e260f19e7391b41c4232ea3414508
 EBUILD selinux-postfix-9999.ebuild 283 BLAKE2B 318d68a538d6a1cabb0073b9039e000516f0338ea262cf921fdf665a7b011b8f46423413a562c9ec67b30cf5f369fe6dd742a9fbb98557f7681bace6482d6f52 SHA512 5c50b99b39174d71980137e19b41293f3f0d923d4b12555bbfb91914db059b0edd90d709657d46029870837a919174c5dfb165db0f3c60636c97f8a90a09dc20
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20190609-r1.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20190609-r1.ebuild
deleted file mode 100644
index 7fece8996395..000000000000
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postfix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postfix"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postgresql/Manifest b/sec-policy/selinux-postgresql/Manifest
index 51d3b96067ec..6e948c8fb12a 100644
--- a/sec-policy/selinux-postgresql/Manifest
+++ b/sec-policy/selinux-postgresql/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-postgresql-2.20190609-r1.ebuild 287 BLAKE2B 7fa155ebcc3e9765b332e9aa05b2d7e83464dc1b8b4e2d160fb34ff9bc70084d34e392e3a33ea277fa9db488cccbc2f88e4f7357a01ec1d2eb9866fb63154164 SHA512 4bbd4eae98aefa5cf1ef8f7c8d691bbfa324d38f513962422f38fd5094c9f7d1517acf8897c8ae3715da4e8791893ac8944569e10faacaad3738e677d46e6147
 EBUILD selinux-postgresql-2.20200818-r2.ebuild 287 BLAKE2B f857579de62c4612b576f57b6817086a2ac37331167438b6a2a38015dc3705d32420dd0d7309e8e4e9ac871ae068504027efefacc68f614964fa839fce3f25f5 SHA512 58d585f24979f60bd1b10d48dbd884e8b8e4b8dfa34f2779d2fb444204f80e820cac8f6fa28011b55ef20f50d2c2fecaea316216ce4b1937511fec1877eb8843
 EBUILD selinux-postgresql-9999.ebuild 289 BLAKE2B 911f6425e0ad0f9a7b1e3fc9f6a7cbf7c85a78df5979334cac2db8a1d36ea1c81a98047c6aac59d7da80f0ca616795eba9d18d4a85672c6a7f652cd74c2aadf1 SHA512 9cf5579ae04bdc08fe08288def53e97e3318f7637c405a1dfc41ed165166b831ab771774a44ae8880cd5c9fc167758d63357c1b3ba2ec579dc20a7ef299fb998
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20190609-r1.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20190609-r1.ebuild
deleted file mode 100644
index ed2063ef6962..000000000000
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postgresql"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgresql"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postgrey/Manifest b/sec-policy/selinux-postgrey/Manifest
index ddc3329244a3..32c49e558f63 100644
--- a/sec-policy/selinux-postgrey/Manifest
+++ b/sec-policy/selinux-postgrey/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-postgrey-2.20190609-r1.ebuild 283 BLAKE2B 23e8a3848d40accaf9135e87e3e01418d4a745ac264cb7ad2ccd764a72e8dae31a5c4d71c66c3a710498818ec229ac0e7ac0f0a234cc550d7d60cecf60269146 SHA512 1303580290d65a85135b1e4522dd5a803f40e598c175f29d3f25a6fe309f9db47ed023ebf20367db7d4086b2f53997a5923ddac63b146a9772765c0bab7e883c
 EBUILD selinux-postgrey-2.20200818-r2.ebuild 283 BLAKE2B a4a4857c0531c97e4083e760831f0081659025e525fa5ad77d440f665e6b4ef66a75032dde7f7d168a7ef5745e759e71cc708f8335b2ac32093126999deec842 SHA512 f70fbc02801eb07cb6414aaf597e6bdd4f34f1763d568cf82b86c24d344aefd5e60a98aa1d55fb425d8ede571bdfdcbd24f0bf780c7716f1e29bd8322edd0500
 EBUILD selinux-postgrey-9999.ebuild 285 BLAKE2B 009abd0f6cdb8ea77e8c7b50aca3b3341b5e3c50cca741b7872d51752915994b988bf5c76c6e5ee90debb896d7def892c6bb0af3816eebd5b301054e1d90e2b8 SHA512 8a68e615dbe3b2602aad013546b000496d20ff665aee5e2fa16a5d3e1f86961e6c7861e6d68f89a419aef767b72d3ea87cde61079eb12c215caa3db27970f8bf
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20190609-r1.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20190609-r1.ebuild
deleted file mode 100644
index 26bbd1343017..000000000000
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postgrey"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgrey"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ppp/Manifest b/sec-policy/selinux-ppp/Manifest
index b10258d5d869..f688e2f180c6 100644
--- a/sec-policy/selinux-ppp/Manifest
+++ b/sec-policy/selinux-ppp/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-ppp-2.20190609-r1.ebuild 273 BLAKE2B 8c81dc3767eed7822f1f328bf0a014e210f0de9a9961c00f80139ac739fb3a4786f2c8bd04631e348d9d6c0c1ac30ac8668cb02889e6fb2631c1d55e87cba2bd SHA512 56e284526a001887312936d1e0f1c9bcbf02b0918d7d12da33395f1d678abb6280fbe5fe4d818a2208d5c9898683b8fa30032e2e7048826ff56b807a0145c789
 EBUILD selinux-ppp-2.20200818-r2.ebuild 273 BLAKE2B 1333321a040e5771a11b933b457adc91e99f1114b5a0d196469a1911f9e340dd9fa86eecb86ab4483f99540e578a3020e38f685498ddcf973fc952932506e108 SHA512 5e62cbb901aecad5ffde508e968871e894c8ead033fb88757429e986fcfea3a77e2b8466f1c8df2138fc76289000e39e4d6652fd1a352f1a76bd300b2a909951
 EBUILD selinux-ppp-9999.ebuild 275 BLAKE2B d4fc4bf21611760188481180f3d6960fb5e06b8afa272d58e6c078b7e13882a31807dc89e844e6b478d09b477e22f40fa45ae1a7fbc64fa2ed87fa86b005281f SHA512 aaa28e2a7100f98f3007f1485a4d3a4abaa61b34d605ba140836eec9d6568ca66a23e6b385cfe675581d5260cccc4bf11f605201daa7f9e136e35e9975721380
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20190609-r1.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20190609-r1.ebuild
deleted file mode 100644
index b56d8145fe51..000000000000
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ppp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ppp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-prelink/Manifest b/sec-policy/selinux-prelink/Manifest
index 2b40c164ad5a..3b4a54708db4 100644
--- a/sec-policy/selinux-prelink/Manifest
+++ b/sec-policy/selinux-prelink/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-prelink-2.20190609-r1.ebuild 281 BLAKE2B 7b4bba06207855fc4b87b9b433d9928b549671c4f0d8fa347bd50fc151dfc26bceb3d7ef07ad86908879582d487017e816e2155df3c1be90856f842be83ce621 SHA512 c54c22b25e250eaf4001b082565a3b22222a0a8ce9d704341719be20ac58a7ca45cb27fc7a7651007a47e46fbeaaceeaeafb5d8f139ad9ca7b826f18f4e8fdf4
 EBUILD selinux-prelink-2.20200818-r2.ebuild 281 BLAKE2B a7e62768364070a4e1bf0f3a128ca58ee241ea0b2dbe4ade2145d63b34a40240ca630e431fe322aefabf38c8e70e352b289f0dad6deb93fb038f2cbe27f968ec SHA512 7660d9b6b5acd5a478c04cfc6a0dfc053f1b4a6354cc21abb9ff4372e1dea886031b67908c2fc91e4c12971b31b64b4132df379ac656b5c3194b02ab4c2a52ff
 EBUILD selinux-prelink-9999.ebuild 283 BLAKE2B 979bfbfc1d033aa08b582f11a85bc766dccba971de429ffc629853d870cd0988acf3cc387b591ab3d7bd93efe93b29089a83cd7ed7c8743668f26dcfb1d5c782 SHA512 9495960ca29aa2238fc1f9343442ac003827e84d287cbf4cf58b225bf7531c2e4349137d1eaa121ca6a4551659656e4b2d76bc038e8feebf6ab5335afe4ab19b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20190609-r1.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20190609-r1.ebuild
deleted file mode 100644
index 8172bbf9071d..000000000000
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="prelink"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelink"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-prelude/Manifest b/sec-policy/selinux-prelude/Manifest
index 8c6adbbf4c11..049e6a9f2c26 100644
--- a/sec-policy/selinux-prelude/Manifest
+++ b/sec-policy/selinux-prelude/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-prelude-2.20190609-r1.ebuild 377 BLAKE2B 36729c48ac2ea726369673e2c448c7b1b500c2b54d5f5793400752eb40d7775a8935b8098f55acace87a32be169fb555ad51c8b0624fd56eb307480a41fd342c SHA512 81a1ede36ad804765689d895166a3e7182207f493c0c9d5bb8a9c157237421225e5390b1ae99f34e960c1c33406cfdd4b3298cc70ea1e4917776dd465e6933a6
 EBUILD selinux-prelude-2.20200818-r2.ebuild 377 BLAKE2B 790da5c84a8da2ab469d4d6554ba5071efe6489d69bd8d06d1fb5d51ee90d7004a62fdc3487140c368e4912cf7dd81701839b98df75d1f34cc1c409826e56d09 SHA512 c38521cebff638ef862936305b7a93c269b8eff4893294f7b0dd1169a647b9a1d92d7ad4e9755dcf5dc0b47158491fb4a3338128854eab296abcb3892aa03bc9
 EBUILD selinux-prelude-9999.ebuild 379 BLAKE2B 10ab3498c7e0db647798f26128e1a6723ef9f93ead2be0f9774fc25c574b5ee09698ebfb592c9193429702f14eb619529bd602ba4d0baa922a4ffa17eb85b670 SHA512 fc7483801f3c7f1f2d6c85d38102de603b55f0937306329064774bd5d89ed3491167ba720bb14922e647ee2a20343609fa047b5a2e726e95eeec4b153f09349f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20190609-r1.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20190609-r1.ebuild
deleted file mode 100644
index afa5a0e304ac..000000000000
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="prelude"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelude"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-privoxy/Manifest b/sec-policy/selinux-privoxy/Manifest
index f6d6af5f1011..cd5e02ffffe8 100644
--- a/sec-policy/selinux-privoxy/Manifest
+++ b/sec-policy/selinux-privoxy/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-privoxy-2.20190609-r1.ebuild 281 BLAKE2B 9d4a68993832a1bdec4cb6e1cb552c0d8bd2e7ee149ee6ed4cb2f6ff582a34e3b02e3b8611c48cbeedfec88b449d08dda32ea031df8454e9da7c9778f77e118e SHA512 8fa84b5730db60a7503dddaa18c5fb2e82dbbcf9380ca58e9205a8ce678be9cce58d2a2a8fda78f369c9fde1fd87980c6050f2cd284b45ac70a0945d5e258cf4
 EBUILD selinux-privoxy-2.20200818-r2.ebuild 281 BLAKE2B 4b0b3748a0cf8e9ae536dc5fb74e5e3417f7f46a396293499b0a6a62f5bc4bfbf45ed2611a644349ef178e001aff77cf63f032609aab8fbac99500964fa1a0ea SHA512 b0a9384e7058a23728211e7db2c073f447a70c9c84ed18c0490fb47f7c63df9ecdcfccb6f881df62bdd77320ed2a74b9beea84594c631fb72f671f385ff235be
 EBUILD selinux-privoxy-9999.ebuild 283 BLAKE2B 2028b183bd5ced71ed63532291b4542581d4673564b2b2708238e426f2db56154e3efde876b881fb2df87ebb58d962a6e027d9b85e751937b2a34a2e0c55c521 SHA512 ca834de2c6ecb6882c93404f7d7202f3f707938cf7531c991b13a00164d061848bb8702a1e24a945b2c505ca324da55e2d81db0f1e773d2ea41c58acd45ad400
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20190609-r1.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20190609-r1.ebuild
deleted file mode 100644
index 66b3bd046a89..000000000000
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="privoxy"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for privoxy"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-procmail/Manifest b/sec-policy/selinux-procmail/Manifest
index ad0ec4bf9743..d9c63790a713 100644
--- a/sec-policy/selinux-procmail/Manifest
+++ b/sec-policy/selinux-procmail/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-procmail-2.20190609-r1.ebuild 283 BLAKE2B 0ba492443995f6715a520ceba5d1cf9052dc1e669dafe591b4934d8474a15299ab12a3384fa5b6f32dfdb871de8dfe4682a6676728ee2170430566d16f6129b2 SHA512 963b7045b67b20631949acb81886648ba02bfbb0001c04f17f0ed8d7758668a9f134461612dcdac0bf0f54bd6f944139d10df9474a56df0b86675c2b31f95b57
 EBUILD selinux-procmail-2.20200818-r2.ebuild 283 BLAKE2B ad25dac61e556baadd3e261aaf7ed55b29bc8e6b309c060326d733144b71c62cdde33cc856976c93530033c1081ebd6d8095ceab574f729fb3658c0b47cd0167 SHA512 b4035fd6280fdd0c4e08f97e4ae3c50bf4098072f8b52224352350d3ec09c406ef2c2668288a32d469b96e807abdd581f2f579933d01ad083dd57309bb95b654
 EBUILD selinux-procmail-9999.ebuild 285 BLAKE2B 8fc5fd56921f88b460d78d157313d7696609c2539ee23f8deec56b9930391021e0c2f48432f4a910613a1b3ddc7a9d61e3fbf276dec7c77757a313833b9d0e09 SHA512 5d1854acf8018b0f825629b4510d6e41e29741fb66eaf80ace1b388e5333b61ea05324cf0925ae2483e651a898ffdb057af95307fdb697409d2c4ebc1c13805b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20190609-r1.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20190609-r1.ebuild
deleted file mode 100644
index 2cd5310e4d4c..000000000000
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="procmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for procmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-psad/Manifest b/sec-policy/selinux-psad/Manifest
index 93858287d641..36627c161b3e 100644
--- a/sec-policy/selinux-psad/Manifest
+++ b/sec-policy/selinux-psad/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-psad-2.20190609-r1.ebuild 275 BLAKE2B 38eedf84ffc91f98d8e39f5c0ef80f492484021dbd3c1c36edacb3c101379d13f5a2fb2b84b04aaff68ea8736a3a746d085c60a943e8abeb738e98b19e64e366 SHA512 c996ee677514903f2a6156861a2e3090cf5e13081e9ace63a1a1d3d69a0c0c67682a8396bac806cc4879e9380b8078326553fc8cfae970d23e76d684a286fffb
 EBUILD selinux-psad-2.20200818-r2.ebuild 275 BLAKE2B 1f7f6ffc266d9fbedfd7111288da3d9f8084ca98fb5e058bfc12d7607c589ddda90e34110e7a4d0c1a668bdd9fe8dca767f1f6eca8106a4a01d3740dca989661 SHA512 05855ad03a8e6e58cc6274c798578ebdab0848a27e30d59e82f3a0709e02c22e8231f7df699155cf5e279622125a8700526215bbfa9b81d91d2a2d91d0a43b21
 EBUILD selinux-psad-9999.ebuild 277 BLAKE2B 4398b373fdb4c89b399ffa28dec0473c4bffa9dc0094cf0a705536273845a103f50c7870c7002850d1b3b724e8a9a2eca087fa89a6489dbf4361d20115572a04 SHA512 6f9427f6589526f42ca48f9e5b2eaf427ec115c68f029c81203d2ae83e8f3ca52257657d4d5cfe28f0787d29d4bcad91be70a53e2584801300a84eb165a38ab3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20190609-r1.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20190609-r1.ebuild
deleted file mode 100644
index de2b7acdb2ab..000000000000
--- a/sec-policy/selinux-psad/selinux-psad-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="psad"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for psad"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-publicfile/Manifest b/sec-policy/selinux-publicfile/Manifest
index 016ae2158e9d..70ea2d0d3a5a 100644
--- a/sec-policy/selinux-publicfile/Manifest
+++ b/sec-policy/selinux-publicfile/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-publicfile-2.20190609-r1.ebuild 287 BLAKE2B f59014bbd52702c4476ad8c0750f722fdeacd2cf4db91f78e998032c6237bd3b43ef8cd22010150ff359fcb5d46b42391f4e1d5f1c6f289caa9359cb54960211 SHA512 f5d7ac2b6e92a91ca3372a39cb751e16a7f93a813d198b2ce53e905d2fd8e37e44b685e881deb265af4f4ca859a91cee41d5ac3915500f4a7433ad243a82c5ff
 EBUILD selinux-publicfile-2.20200818-r2.ebuild 287 BLAKE2B 22b8769758d6013b9be014bf577b8b66badfea1c7b86a584c4a060fd48021a79419d3dca2f7b9141268857d52f50e6980e7660659ef8fc118f614ff3f4f9e7fd SHA512 6d1ed426a7c00cad7625cf260401046c6ec653aec2e3c35c590a83a1f78c5fb2580f22f2848b98cf3df272f0034ed086bf0b36db3d57903e5519e2c8931033e2
 EBUILD selinux-publicfile-9999.ebuild 289 BLAKE2B 648818f8699db6b4fa865f527db6419f4dcf347058243d17b5e928ebeda881027faffb8a85577f5b2b53c8fcd99e22eb46f99ee5f153aa03f3d21edc89869e41 SHA512 5a192581a23bb06180dd1321bd9ab025d7a9ae1fd16335d012341ee8cb58f8e25a1ba61e240ae13b6e023ed149415a0487b74f1e965988d455b5e47a258caef8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20190609-r1.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20190609-r1.ebuild
deleted file mode 100644
index fd7141671496..000000000000
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="publicfile"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for publicfile"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pulseaudio/Manifest b/sec-policy/selinux-pulseaudio/Manifest
index c31fc450cbaa..f3dbbc1ac9b5 100644
--- a/sec-policy/selinux-pulseaudio/Manifest
+++ b/sec-policy/selinux-pulseaudio/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-pulseaudio-2.20190609-r1.ebuild 287 BLAKE2B edde62e62f4d325c67dd1e0a065402fc075645ae94b1a990c66cd9b3a4ce264c97ee8b6a801a6a3b0f712d867fb394da6747e8c85520348ad8cbd290dff4109e SHA512 3f65d0cc73ec4eaa4557cb899e6a136eb2b2fb7a07ae3308e045c95bce0e789791eb0eb870fc88dde507a2c296f45124816e7b55a0d53ffc40bff22fe1d61517
 EBUILD selinux-pulseaudio-2.20200818-r2.ebuild 287 BLAKE2B 2de0f3754c2c0e09ac01df36ba2862a62bc594011d7989aa849e44be0f7ef4a61e6cc673bccbfa040e3363649159f3f59f52d976ff3d5ba3f40b55a991bcf3de SHA512 d98381f598d65852886efd8fe80f921b018769005f0da13c0761f81be1892f7b9b6b4622e243b298e6e84dfddfbe4d02d37a517f1fa818f11afbc741efb87d78
 EBUILD selinux-pulseaudio-9999.ebuild 289 BLAKE2B addd5dbb8790d8b564469f5682af276fb79dee014dd96b810fd8206690079366996a0cd298433379d36b24758cdc5d7b7bfcfe5593085447849a9d1320bbb13e SHA512 273415910363b3810f7fda75f05ca01f020b56a512255b11a5b26613ee29d6cf32497255b87278237ba8fc44255ba372ac99d2f1eb84ceef371a14e62c69447d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20190609-r1.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20190609-r1.ebuild
deleted file mode 100644
index c9a025aac615..000000000000
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pulseaudio"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pulseaudio"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-puppet/Manifest b/sec-policy/selinux-puppet/Manifest
index 23ebda62581e..d417ef49d5c1 100644
--- a/sec-policy/selinux-puppet/Manifest
+++ b/sec-policy/selinux-puppet/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-puppet-2.20190609-r1.ebuild 279 BLAKE2B f17f9fd15dc1c51693ded8a0cfa9dad8b50cf3a697962ec847a2a8741e5a781e431634825dea9b59a2dbaada0e0d1a6524ed7e18f9ada846fab4e5a5d8795f9c SHA512 4d7a270fe6b7f3b66857d24d5053f29acb248cd4f8f3dbcf6e697d4df0b65b3b0da0d2ed6fc6f0db73f679c90afc3d47c2d8e3d72e3d90e6f9a9feece4701ed5
 EBUILD selinux-puppet-2.20200818-r2.ebuild 279 BLAKE2B 61384b410c78cb80ded6aa770bc779018901b5d29f933a7a604144b93dc8422b69c10ba20c43f5f1197d92e336d291e7b6bb26faca90ab429d4836248eb5ed43 SHA512 fa26ceb2c5a1d4a01934087a7a834a902fa22949dadaecba8b0631ff41f55feac9c49523f9787711e9882e616deaef3327eebbc04f3bdb2515dd4e1ba48abdf8
 EBUILD selinux-puppet-9999.ebuild 281 BLAKE2B 647dec3b66eed6d1f66a5e5c13840ea5f7c70a15afa6d44e1a6bcabd7aec989b5b770773dc8bbb2d46739e5414cfca3d623599b08ad3ac3e03e4df412c8f5c4f SHA512 01a672aaf11e909d6b0fe17c6dff4b6b0e65c7f96306df85d2e92ea79586bcaf131a58864638fb95033d6721c4d28a3899c61b665c31ec77d4f75225217f25e0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20190609-r1.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20190609-r1.ebuild
deleted file mode 100644
index fde8a4a757d7..000000000000
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="puppet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for puppet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pyicqt/Manifest b/sec-policy/selinux-pyicqt/Manifest
index 37771e5ad9ac..54a77d6e3f4d 100644
--- a/sec-policy/selinux-pyicqt/Manifest
+++ b/sec-policy/selinux-pyicqt/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-pyicqt-2.20190609-r1.ebuild 279 BLAKE2B d003e81ef8067d9cce78d1ad911a14ba7f5c006adc5486177607c7d9f7ec7a24ccce65c3cd02cc9c3aceb77a4f6f309b04b1029cc520ab70f16b0a2e16547927 SHA512 d0ac5e93a361db8531082f47b9e9a48e239594be1a2e0d29971a149b4fef6ef7066e757dd009de905568e809503ae27fad783741faf3f5711c94e522dc2f20e2
 EBUILD selinux-pyicqt-2.20200818-r2.ebuild 279 BLAKE2B 389e29d3e678b427fa8cd1990bd8fbdac148e9a5687c7b5316de7ce8dae28eb1615eb0d0e9ffbe3de15bb8d86285eaef7c746da670d9e4bc83306d11169fa3c0 SHA512 4376e09412f985d17e0dddb0d0f60c397e96b14c95eb7aed2ba01c40668bf613aa33f9b081974520804705c79596c9946cce7bf224619d13205ad253a53cec95
 EBUILD selinux-pyicqt-9999.ebuild 281 BLAKE2B 60d248b3dee62c541907378fb300232cce00e39367a157632a62a530ce145bbc4d99e13d498b46c93f02712a266833e57c76382d19790cc0104ebfd50fe3cf1c SHA512 502f70f9e8b9665956f140fe48232d4521c5e654a5f6c0a7a6495bc342e5367471d70b3d8c36aa01917da4170a769852e6a75699dad6838388acf1ab7da87cfe
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20190609-r1.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20190609-r1.ebuild
deleted file mode 100644
index 88b384de99ec..000000000000
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pyicqt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pyicqt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pyzor/Manifest b/sec-policy/selinux-pyzor/Manifest
index cf9669e5706a..63f095b26ecb 100644
--- a/sec-policy/selinux-pyzor/Manifest
+++ b/sec-policy/selinux-pyzor/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-pyzor-2.20190609-r1.ebuild 277 BLAKE2B fce32157f155ed1de539056072ef7a9a531c91628f40f17553212bd98cbf18988ba0c4de809a4706e6a6d4d015deb6771a3d0769537ad8e1e1d74af37a0a4158 SHA512 73a921f3b5daf63d307fb82ee37d873b5dd794891669b9b4f18d21d3c508a0d654ae9d99c7716861748ddfd04dda9ba50331be4fb50e6b05a7fb1af4f9c167e8
 EBUILD selinux-pyzor-2.20200818-r2.ebuild 277 BLAKE2B 88c3aefb85df8f089cf646f99f335f42e4f604dff6ada0c19833b74f0f907e99f7e84faed7e0ccb8ddc8c801226ba01193154efe94957375e287573d65897726 SHA512 c7e008e3917019ca442b6484c16b735706caede478a8d4a5929efc6468288ea3da125a894997b6d0fe397c213dbacf1b0c5f8e297d5614cf67401ccb1b697816
 EBUILD selinux-pyzor-9999.ebuild 279 BLAKE2B 1d7fc2765b6216c380751ab9e8a200bbf5c2d86f7a9f38ae8a0bc8def612ccc20df6b6906648ff433ee196040a9dbb27b46511d686ad0cd712112c598400f2b4 SHA512 819c779eb7619bc47f7f50f6531eeb2a41e94c3a190a4f6954dc3bee33f5842201dde5f20e7acc968181167d3d9666835d893fa5a161612537a9c7daeb70d9b2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20190609-r1.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20190609-r1.ebuild
deleted file mode 100644
index ec57667a57d1..000000000000
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pyzor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pyzor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-qemu/Manifest b/sec-policy/selinux-qemu/Manifest
index 93090217a7c0..b0bdea14b83f 100644
--- a/sec-policy/selinux-qemu/Manifest
+++ b/sec-policy/selinux-qemu/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-qemu-2.20190609-r1.ebuild 367 BLAKE2B b37e06d3494f6086963c4d0122fac46c00bd9701b1b35d556f090b2227f431edb94864aaaeee7d7fda2fa9dd53a466324783eccb9403b99f5d54c738af4e9848 SHA512 5724d5e53b5e879f3ac518cfc02ba530cf4277e2e82eecc05dfa90d040208fd8d01d07d5b9b1c1781b3a2fd79b8fc7c659dc569fb7d3d3fdf32db02a3c40ec83
 EBUILD selinux-qemu-2.20200818-r2.ebuild 367 BLAKE2B 533bed411c9aa3c2facbe361222d15fa0dd971f6f4d44ec8a69e29fde901466357d3b608ccf2702eb6834532e60948e2e412ea010e557bc32b1fd7229bd9f3f9 SHA512 bfaf1a79ec6093c2bddc8631e70e22acbd8ffc696dfa4348b2f9be8272adb65b156c0f62a98f21de687c4587e446807e6933418b1ca09d53be2647ad1378d6d6
 EBUILD selinux-qemu-9999.ebuild 369 BLAKE2B 48b38fce6740eff32e94a3703694f67b2e94cae561c40ec8d9113b0ef9171dff407dd277f8d65aaf78237edaa717ff35ac3f875381318ca562a34524dc77a461 SHA512 d24cc7d6b29e65aa832e7d0af621b14ce4edae2fa1f103228639d46296236cc3d62ea37476f829e3aa89fb5a04a5fe9ea3c93ee898d1e246d1fe18bbd34cee0a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20190609-r1.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20190609-r1.ebuild
deleted file mode 100644
index 340db38be4a5..000000000000
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="qemu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qemu"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-virt
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-virt
-"
diff --git a/sec-policy/selinux-qmail/Manifest b/sec-policy/selinux-qmail/Manifest
index 6bf9eed5fb4a..21e4f3954ac3 100644
--- a/sec-policy/selinux-qmail/Manifest
+++ b/sec-policy/selinux-qmail/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-qmail-2.20190609-r1.ebuild 277 BLAKE2B df1eefd6d3cad3d2fbf9f359a85c90bed4478b559de742a498161ee008cdba9f7729e1293dd7de2aaff09acf4a57569fb65bc918bdeffe78a14258a400857d4c SHA512 556e1801db80acfd7ce13174d924eb1fcd5086978a8e4a03df0f1816a5b038d0edeaf03ca62b9057edd755380c9cd40c6a2db9e11a8c32092836a1150bcaf8d9
 EBUILD selinux-qmail-2.20200818-r2.ebuild 277 BLAKE2B d63766924f1aba016e1ba18c2ac71e35962eee931a7c5d77ba0af6a981b66a4f4c2c1cb68c060e66abfa8221452eb13a09f48043565c85617a7788e3a33c0f2d SHA512 8b97bcf524ad68dd3e31242989c4dc56d1611825ab9692adf5bc8ed5f04e7901a5f0934285e7edb68586cb93afa41d0ef587e33857f9df15ca1016a1a2120f45
 EBUILD selinux-qmail-9999.ebuild 279 BLAKE2B 148a4574023309817c392220f2466649f6a790875ec0e72dada18b6e6ed3dc43102d937b1eb37ab43ed57334cef9ff72182f544b29dbad4219b42714c729cdb6 SHA512 3a8f969f93cdfbac6c70e26bba107315ae0227429658ba7c74541ae2a43a51df174a52f584655b1626a421dffd3c8a28efe8c4bf281b4cdb369219271e650827
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20190609-r1.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20190609-r1.ebuild
deleted file mode 100644
index 0cdd4b610587..000000000000
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="qmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-quota/Manifest b/sec-policy/selinux-quota/Manifest
index 539cb19ec594..4ddcadefadac 100644
--- a/sec-policy/selinux-quota/Manifest
+++ b/sec-policy/selinux-quota/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-quota-2.20190609-r1.ebuild 277 BLAKE2B 4873435866ebf5a02df124aa213e5fc6cd0d8323cf85c4b579c8fc3e376befd2d0fdcec3b9b51e01a209fce1f4b23184e0a49c61bc722ae5978f99d30153efc0 SHA512 1bc30bf332cfdba0799a89116799794430615bc74cb9cb907924122b3f10ccb980035e513d933b5f7b6b8160968053fdbe2181b0fd9544b303c8f1de373a8138
 EBUILD selinux-quota-2.20200818-r2.ebuild 277 BLAKE2B 6b6db48df1f0d69057053c33c73db261b3eca56ea891558c743028a073348aeb4949b05c5589d219429d91919ad483ee53a6952140f38c1f0ddae1f586346da8 SHA512 35d912e9bdfcde78e7634893833104b2663a67b40b97eb11ca33b73b0c0795009084076082edd10c6c42c3f2ccfacc83640ad446fca7101faa7d9ef5b5257f49
 EBUILD selinux-quota-9999.ebuild 279 BLAKE2B 9f70c206ce65a00e1ca80eca5bf4f777548e6e9315abf7bc87987527bec636be665dfdcbc4fc059f7606a4616387edf94d1e5ce5d21187c6317d0014eff3eecc SHA512 e7353f3be6275408de8a97c60371fdea6693da81f10d8586d8196243d0a06efc2e2bb72384ff053804c2e78e107851245cded8e31f95a66d9e1b44ee96fce5b4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20190609-r1.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20190609-r1.ebuild
deleted file mode 100644
index 3e205072b165..000000000000
--- a/sec-policy/selinux-quota/selinux-quota-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="quota"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for quota"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-radius/Manifest b/sec-policy/selinux-radius/Manifest
index 96ea77cdc471..f8a3c1c92935 100644
--- a/sec-policy/selinux-radius/Manifest
+++ b/sec-policy/selinux-radius/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-radius-2.20190609-r1.ebuild 279 BLAKE2B 3c7682615146b94e09fc7e90bca1eaa79fd5691da16b65fb0669a20284cd233bbc509f4d38837a1aeed9a873eee5559c7c8fcb9e223e8b015ceb86be284651e0 SHA512 3ff39216cd13c56573d97be8b777af1e915df22eab4f071bba11c4897b76ddb696e74e44cb724c993962dd3cceeb013c07ead234932db76981cf6ad4d26575f0
 EBUILD selinux-radius-2.20200818-r2.ebuild 279 BLAKE2B 5d3218340ad75e281fddf91bb72e9ad02015e4398317773b87d8400ff41fd563afc9f0c1669cdf46cda6ab8f03f0fbacd7ba62c2cf6375012f33397c722a705d SHA512 d5f08a1709f06eaa258e2b801e38845f83caa4d32c696a4047b06daeff9f6bc28a6ee01f090e2be448ebf546399248888f452e4aa5cb164f720d55186a76ebb1
 EBUILD selinux-radius-9999.ebuild 281 BLAKE2B 1ef2c9176705b434492ad0d01bef43c8c688ace59f817390d1bd872a94d1c053277cca9df28869467dc4e536ead955b5d3bddd6fb4dacfcfef8b70348670f38f SHA512 c955a02642648602789e4d9e9b6e808c7a65eb17cf9830afdf4bf5acc2c01570ef025fde4ab2b7eea51824ee9dfff8a272dddeda167284884c5cfedc513a2273
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20190609-r1.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20190609-r1.ebuild
deleted file mode 100644
index 38c3e54263ce..000000000000
--- a/sec-policy/selinux-radius/selinux-radius-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="radius"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radius"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-radvd/Manifest b/sec-policy/selinux-radvd/Manifest
index 6f1f03e036ce..648de8019fc2 100644
--- a/sec-policy/selinux-radvd/Manifest
+++ b/sec-policy/selinux-radvd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-radvd-2.20190609-r1.ebuild 277 BLAKE2B e1cfe171b940eda991c3756f9c0f26f55ec9ba561ad907fdcce409884c83201f8fc12fe09d9b31915807ff28f3766de7d836cec37d843c340651cfdaf5f40c12 SHA512 c072dc95eb8f061f0ac6a52c15a7366cf99daab1e52a8aa631f7857ccb90bb4a53a2576a00c11aea0db223611b938ef818fee6b8a480b5f345fa30fa4ac316cd
 EBUILD selinux-radvd-2.20200818-r2.ebuild 277 BLAKE2B 0e7a514c8d63ecb1c45e94720d3b8f20e35efdeccc71e7de67adf6d7545e8fecf3ce2625368f9e4b916e02379bc484e1fbf09ff54075cbc75ed54fee4455c975 SHA512 8edacbb7e494cac2a0ac110d574f4d495a85498068af3c997dc4ffc4e38f0823ae137a9190e34a6d32e16a66c9c8192e9a1d40b2603212d728345507613c3096
 EBUILD selinux-radvd-9999.ebuild 279 BLAKE2B 55f295bd660c83ad434a546b48bd65a4cb13f94109095d6f5598c30cbde93fd2ccc1a547938909e62aee39cb3f30c3504cd1abcc049ba7f880c79a712768acf7 SHA512 dd914c329929732eb4a60ca6e721502c63fdcef811bcd5d906760e729a8fe3906b9fab488160f59c182065de42c5c65ca25a57719a0e975188b67cf570045130
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20190609-r1.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20190609-r1.ebuild
deleted file mode 100644
index 81b55dfaa03a..000000000000
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="radvd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radvd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-razor/Manifest b/sec-policy/selinux-razor/Manifest
index 72d0ee2dc31d..5302b14a8134 100644
--- a/sec-policy/selinux-razor/Manifest
+++ b/sec-policy/selinux-razor/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-razor-2.20190609-r1.ebuild 277 BLAKE2B 7d555e27dfc8a70204b4d55c97264393de7e60dbecfb144d75e697121a46d08f429feee94a1d78d3f71ac822a45a1dea00fe370dda14f81e51e2f2f49728224f SHA512 31d004ab897bc4ddee449c5a459975cc8e03a288430df5391ff2fa73d55a70b39b8646aa4be4907eceb1166da2f0a8aaf9352f6524798883fd766661eeff19f0
 EBUILD selinux-razor-2.20200818-r2.ebuild 277 BLAKE2B b9a43eb99d284ab2b6ac2193a3feddbe0a40afc3153ea74d111215690dfd5bc3d515ea702eb38b626c3eed9154cd5a117863ce741fd5ffe9a0c2cd20d46dcc48 SHA512 cb996e76289daa41f4d2ec3d0750f4a1a5a98458f886aa56cb0c4213bd61a355d4d64c90844a223d47adf2ed6a17802d40ccd18587320bc3d59bfb865a795e6a
 EBUILD selinux-razor-9999.ebuild 279 BLAKE2B dcbc86e2c28078c933f8f0c5bacf4c1a8255a480c48f9d97884e19a6a62bfe5e384ab10c9374c33b578a359b223ce4f019077a58edfda65829a37b5596c51046 SHA512 30a61dda8e023f10511da5121c110c8fe532f61064d9ee3ab793dc7b82a651c36e150c902d94f0d59cbb8350753e8ed086c194c471e747f0a3019935c990f2ae
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20190609-r1.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20190609-r1.ebuild
deleted file mode 100644
index 56fdd0c5c393..000000000000
--- a/sec-policy/selinux-razor/selinux-razor-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="razor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for razor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-redis/Manifest b/sec-policy/selinux-redis/Manifest
index 1b725fbbe330..503b90981aab 100644
--- a/sec-policy/selinux-redis/Manifest
+++ b/sec-policy/selinux-redis/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-redis-2.20190609-r1.ebuild 277 BLAKE2B 927268f70a375cb34cde082c7fd0c7bf14521e868724ed09b360bd2ccfde9804bae801d017320efbefa8c53bb59fb26580546b6cb6047c7b0300557fbf3a5c40 SHA512 dbbcbfd2282784268278d7bf8f583ba69bf1a71be225641271858bfe5c1d6c3cb4d2ca9a84d7ec936d8d07b89acbcc2edca216f9c9fcbccc273bc68224212fdb
 EBUILD selinux-redis-2.20200818-r2.ebuild 277 BLAKE2B ffbaec4c472709c7c3e24029d4386b855e26219dffe877e2764e785bc6a2c9c737372c391db25e0326c87163554d8843a82301b57e8e50a83b81d3ca4947996d SHA512 d43c4762fdd4078cf8bb5501b5b64927c17b33ec12c7f220aaf5911f1e0a3245da4df1fbf0df2e39ef6d213eb164fb06502e626fcebd634d6abb85e3184cccdb
 EBUILD selinux-redis-9999.ebuild 279 BLAKE2B 8fef9bec457f36ebd16573dea72ba012fc2d831d67c653dba6f3595c6737922f9b5a00c090b1f36988e3180304df752aafab6eb35ce5d2ab27f30aaae7c52d77 SHA512 f44af72aa74476926607618d2b6a6baa11b0bce4362cca088fa8065151131781da0c0e37a15668b6a6e9becd64e7c23a1e90776efd2c43a10585027c27c934c3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-redis/selinux-redis-2.20190609-r1.ebuild b/sec-policy/selinux-redis/selinux-redis-2.20190609-r1.ebuild
deleted file mode 100644
index 0a5cd1d0cdbf..000000000000
--- a/sec-policy/selinux-redis/selinux-redis-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="redis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for redis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-remotelogin/Manifest b/sec-policy/selinux-remotelogin/Manifest
index 035bce7d757c..c3abea7917d4 100644
--- a/sec-policy/selinux-remotelogin/Manifest
+++ b/sec-policy/selinux-remotelogin/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-remotelogin-2.20190609-r1.ebuild 289 BLAKE2B 5343f05e29cf8408593a5da41114de863230f9475de497d99dd3a959389ee73ecac77d2480c5c4e42c56cd90a4e96ab16386fb96c882563c49079483345d1b13 SHA512 800949a67ea9aa632331e28e49b1d21ee1289361328c9a4f913a652bbadc3fc4f4f6e13766c99e6a1e7fd626be933dd75aa2b516a01e329110a6788f109b8689
 EBUILD selinux-remotelogin-2.20200818-r2.ebuild 289 BLAKE2B 51e18325b32fb63bce9371c8223319984345f2393a3fb95ec391efb42cd027e46ab753aabebda08caf24f989ac8ed3bbb81609fd416b797cdb11b5105812181f SHA512 b21b5b26c0bc4be350ca88f08b4385aade0f5cfafeb41126b50a5c4d8c555f3b82ebcd69f7685a9ff5627f6a400fe861dd01aa454ef8cae4200a4c0d4e71c28d
 EBUILD selinux-remotelogin-9999.ebuild 291 BLAKE2B d043a5308b943b017a022eb01b7f0364af8020b17c76fb5815e5c98609260e7690f89cc8b180eb19f6b7912fe01f140ffd932ba09242979aa4cd1a164bd571f0 SHA512 dce86ba610b245ec242c6719b483fe6eda4ba953fca9f0c525a36df52feb2383b2a0ebd574643eb004fd6fdcd2738c0d0be357f355bcfb59f2ab382a328f746b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20190609-r1.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20190609-r1.ebuild
deleted file mode 100644
index 241229603230..000000000000
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="remotelogin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for remotelogin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-resolvconf/Manifest b/sec-policy/selinux-resolvconf/Manifest
index 5771230c4c58..519a58dd91b7 100644
--- a/sec-policy/selinux-resolvconf/Manifest
+++ b/sec-policy/selinux-resolvconf/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-resolvconf-2.20190609-r1.ebuild 287 BLAKE2B 8c02f6f0b9051decf2f7d568a9416034367635b033622a2720ea9ad82de3de67e2d29d49453da993a165d992807c0e099301449050f4e59a349edce1e1dc6ed6 SHA512 340bab104b54af8b8ca3a0ce6dd8fc5c3ec2b30e6481fc82cd51c8b44868ce7aa175bb5716cd40e85734e780e03cb56ca00069ef0ae14e0c9db9937231c79b9b
 EBUILD selinux-resolvconf-2.20200818-r2.ebuild 287 BLAKE2B 13702d52eb448e94ed7c83dd71d1be3c8b8e7cabcdfef4aacd16a47f4202dba160b76050a1f99426a9223a850163b6a6c9e364cb7fa1b281c6d2c75fdbeff4df SHA512 39dcff854cebc3350a1c319698478c2a387fdccf0b9a77b8756cc37affd58affb0630dd3e9949bed0f781c8ad3f5b6c5c1ea23b3ee7e8573d2344e6a6ff2bee9
 EBUILD selinux-resolvconf-9999.ebuild 289 BLAKE2B 1c56293418c0721eeb26d42e406bb25d5555d8fed040416d78e64079190cec5fb255ada94debb554a6f7ef236adf3b9380e247ea4052be4586d58dfebf162d44 SHA512 bb7e44e8a401944f942d62c206ac22d99f7c15ab5c614e01983e0834604344ae7ede05401e8278f44cbeaa95e8167f2640956d76b86537dcac7f29aaccbdd084
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20190609-r1.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20190609-r1.ebuild
deleted file mode 100644
index 0f62bf940870..000000000000
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="resolvconf"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for resolvconf"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rgmanager/Manifest b/sec-policy/selinux-rgmanager/Manifest
index ab0e03fda2cd..02959ce1400c 100644
--- a/sec-policy/selinux-rgmanager/Manifest
+++ b/sec-policy/selinux-rgmanager/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-rgmanager-2.20190609-r1.ebuild 285 BLAKE2B ce09af481f944d8643f53e19107480dfc21f102d2cc464cb669774b505ec8587ada119f0238fd33be58e4546e201f77e42387360d19a1bfa8f87178ebc10523b SHA512 5f339ba6cd31a4233f52c15dac5daaf9210f66128e8e265e68c24ab0904b4131378cf4ea45b41a1e3840dee797d89094ba341d203e5adb52d8a823f5f40d23fd
 EBUILD selinux-rgmanager-2.20200818-r2.ebuild 285 BLAKE2B 527059597f06cf71e8d755e9655f6d54c58d25f9fa0e46593747d09b0ecb408d938fbe69e56041bb9a74d22a5373351d0856dea5bc6a977029b2fd7df740b8ce SHA512 8f3ec5f0787ae9a8ba4c955e87d9a8aebc654198028d4ce0482a54f5b4534bdd3af83c56683aab58b74ee3710ad0d468c0c334e816455ae71f41f3135f776f62
 EBUILD selinux-rgmanager-9999.ebuild 287 BLAKE2B a305ddf714a47c68d0de8b7b154600fa2c8e5ac1c33a02e01c971e17a9f5978590e54415a3f679a62b32f0ca4d2cc231e83eb21831f26a2be1622d2b6c044eff SHA512 e1a0e89d264787aff74a8279cd53da7ff6c7587af80bb5d46807f655fda6482e1c7091475a5c81c82a399f8838800cb13951feb5188a4a4a15f0824151321625
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20190609-r1.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20190609-r1.ebuild
deleted file mode 100644
index 89a8babc012e..000000000000
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rgmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rgmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rngd/Manifest b/sec-policy/selinux-rngd/Manifest
index 22fee009c447..d81cda2fe648 100644
--- a/sec-policy/selinux-rngd/Manifest
+++ b/sec-policy/selinux-rngd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-rngd-2.20190609-r1.ebuild 275 BLAKE2B 5fff4f51f0fe4c8799232691402c3b49acea4844da3921017fb91bca6073d62cee422bee333b49328570b5abfccf9d987328a231d0f9afe3a8b3c6a9139e98a3 SHA512 1dccfef008fdc8c622cae17c30138a1ef6f62018dbc4d72a8a0b3933b84d5a21950e359ae25580cd18508d9102a80111902f4a5dc355b76a8ce84f2f014d802a
 EBUILD selinux-rngd-2.20200818-r2.ebuild 275 BLAKE2B 88243a516f59b286d3b1e8d09e1cf7cbf818da8ddea02285e4427f8568808f2b955f4faf1062d5c02d8d607b9ff6a74dcf31e145c38dc5f8f73e8b3f7f4644f4 SHA512 0a86cc5c1f14ec8d41a7b738512ee5c45adc189272cb9ba364116643ac15b8f35703b1bfef946b110ff001c96305d79d8a1c6e01c0833c77005dac4887832c80
 EBUILD selinux-rngd-9999.ebuild 277 BLAKE2B 204b5547d1c31f509d297d594773d1fdcf648075960196e591c75b47bdaee8b2078deeaa7dc92da91250e8b31453d568ddfd9c86cb3b3a0e90353221eab2f219 SHA512 ddc984512918816b0ca0dfe0378bb623f3eaddca85627c945cd310c78ab741dfdc707eddd3d8575421e7ab4ac085c193df11549715a3f913442105bf4109c78e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20190609-r1.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20190609-r1.ebuild
deleted file mode 100644
index 354288ac5c95..000000000000
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rngd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rngd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-roundup/Manifest b/sec-policy/selinux-roundup/Manifest
index 80c4bee4d1ba..d6f5ba5a2342 100644
--- a/sec-policy/selinux-roundup/Manifest
+++ b/sec-policy/selinux-roundup/Manifest
@@ -1,8 +1,4 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-roundup-2.20190609-r1.ebuild 281 BLAKE2B 0e9bed6d4a7edcf67afd3bada60fc8f322b82fcb77f01f2fd9bf893d96c05ec1f753ed0cafc2e39501effd619d6a0e9dc98cc5b6706a13be372bd172ceb5f472 SHA512 b674a84a978ed88001735bf39f8a375e784ca49d3d82d77b284ee9396fe4fc15092c19ec06d7f598807b7e3102ea7291ce0f94725b6a2bae902f83bd08ff8ac4
 EBUILD selinux-roundup-2.20200818-r2.ebuild 281 BLAKE2B 24a5151a107be16871c431ad63eb6dde9f9433435bca47a45aeedf77c75c87cc1109b67a7612cf45f629f3556fa37befdb9403eaad61ae825117e440aa66d270 SHA512 21e0e67b6e0e3aa17c270d23566ad4b6c54308593d5e67691db7e2c30d582b2727dcb8a4927527d681d9241245f01e3f4383cbad19ac302dd5899fa73095bc77
-EBUILD selinux-roundup-9999.ebuild 283 BLAKE2B 83cf5003730236038d97b5ba91a440f7e14fd4ab52a8918fec83a599641d63dcb9cc34b540f78b1c8dc009a47ad48fd2e97ac3c7eed535a47599c9088fa67766 SHA512 6740607a84af2d59f05ec27bb10b325ad76a6bcf31c4afabf3347b2016e97043ec64661b567a7e0fabe01f7a7ffd6a7447be018c08ad1f200a4d357d161a2eb3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20190609-r1.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20190609-r1.ebuild
deleted file mode 100644
index 48dddce680e8..000000000000
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="roundup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for roundup"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-9999.ebuild b/sec-policy/selinux-roundup/selinux-roundup-9999.ebuild
deleted file mode 100644
index 3112dfdfe9d4..000000000000
--- a/sec-policy/selinux-roundup/selinux-roundup-9999.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-IUSE=""
-MODS="roundup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for roundup"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-rpc/Manifest b/sec-policy/selinux-rpc/Manifest
index 8b71aa1f666b..bc5fd6f2983d 100644
--- a/sec-policy/selinux-rpc/Manifest
+++ b/sec-policy/selinux-rpc/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-rpc-2.20190609-r1.ebuild 273 BLAKE2B 8c205be1b6dff8d32ff74ee6c3327e2aef789a20542674ef09b72f5e0bb4bf81555c42d0fa1ed337f832c837ba462512369909ba4d08103fa0e0cf527624cf4a SHA512 4ddbf2c541995cedf12039b952e172d7f18c4c05e9e135741127d6f8ceb888269eea56ca015e4230d35fcc11634e9a2c7276a814240cb4d78bf4f9fb21ec0571
 EBUILD selinux-rpc-2.20200818-r2.ebuild 273 BLAKE2B d7b8a7e5289a984388f723a7505fa04c35ea1c3956669e586bff980f687b80268ef93ece8b77c0afc80f9f9b53240a6ff49b602357cae7ccfff317528abce9e4 SHA512 c4267a4051672bf17d5f9a1fcf3acbaa301bd977024f0605329499c4d749a711ea888743f1dbcfb36b256cb6c7a78b098b3f87b4a85e9ee85d420c54a91bf929
 EBUILD selinux-rpc-9999.ebuild 275 BLAKE2B 44bd3ff40b8f8b3cef5e512e0c2d51be7c682b546226048e7c0c4f28926d2f051d93c6b905b55a9ad3fffa41586e97b8bebe0dfdd95b5bf5248a0548e2b503f8 SHA512 8e470f9bbc0f9ffea9f18974d553069d76a35a50dfdd9e4bc57b2dbd29d9bbdf3ec0cabe4ad8a0aca36189e70a3a915b39af0006846f736d9f75d21244ad7454
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20190609-r1.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20190609-r1.ebuild
deleted file mode 100644
index 2aed48d48a79..000000000000
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpcbind/Manifest b/sec-policy/selinux-rpcbind/Manifest
index 8cdb8af410cc..0aa898fe43c7 100644
--- a/sec-policy/selinux-rpcbind/Manifest
+++ b/sec-policy/selinux-rpcbind/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-rpcbind-2.20190609-r1.ebuild 281 BLAKE2B 1e7ca05a478cfb2f54888a18cb58c41faf7108b2a0a00b426bd27500d41e3706901a06f06ac82a237c8b8f2957c177a8b7bc1dfc35a6519ce340d8dedb649aab SHA512 f4a9148e5dcb3055deb4dd1e0a46e96b0363725a198ac2b895734fe1a2771979719e81174447b6188dd3886ddc3726df5f0deaf8375b638a74079e553dc96d5a
 EBUILD selinux-rpcbind-2.20200818-r2.ebuild 281 BLAKE2B 245a890e1dc64815fafe536acc79dfcf4b8f19fd17b98e207599163d79378640b912935992633f355a0f19ccf59c9b79a37dc8d3e4c6f3abc8856b6d39e44e2e SHA512 f505ff16ae83f744bbefa3aa67992cff30a89b62579c25e65410f9add13e81212458bb05c370c6f20bb870eba3717742400959aca2d00e150c753df88f1ff8f8
 EBUILD selinux-rpcbind-9999.ebuild 283 BLAKE2B 659e6581f250b58690eae08e0b6cc8e11130e0588cb3700d6a5ce21719f222c9a04fcac85e0f6f1393a31503563bf364460f01e9ab35817898a0137637f0ab51 SHA512 a729758bfdcd951ab074ed339aa9c009dbf063ac139143b17db69880b6a37d28eb4283ec85ffecba154e8ded34102570cedfddc044c5747249746a556da687ba
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20190609-r1.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20190609-r1.ebuild
deleted file mode 100644
index 20e9cf2815da..000000000000
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpcbind"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpcbind"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpm/Manifest b/sec-policy/selinux-rpm/Manifest
index 83913e70ae58..7fa8406d4c37 100644
--- a/sec-policy/selinux-rpm/Manifest
+++ b/sec-policy/selinux-rpm/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-rpm-2.20190609-r1.ebuild 273 BLAKE2B 9bf704dd99a8bacbb71636a17431c2edaf75f01c62ce831df0bc2883cbd6933a15e921210bc57f40ceeec2ca85e2441c9b5743d9454670257d606ffcd38ebd0f SHA512 e2f9b5752721d7a56687f4997fe703ab9283a3e30d79bb94a39f9494852e264c3bf3b980663cb2a2ea294a62849e8395c64ba991a7e04f2b0755fa44c8395124
 EBUILD selinux-rpm-2.20200818-r2.ebuild 273 BLAKE2B f418915fa90df1ce4f91a04f70d7870b44e4b0d6e436f90a082f06c7ef46e1ac28aebbc3e8bfbacf6942f91b912c7d817195b7ec636b5adf65e77e610b35f328 SHA512 53e7e963b4877887a254e738a440e74920864ffa3ecdc40f08a885a11f806de0f7330ed8751d4624fe0ba856a08dfea72d76d23b06dfd6ec2052cbe9935b9ec0
 EBUILD selinux-rpm-9999.ebuild 275 BLAKE2B 7367995fe8e5e64bc4334109c872c80350a1d589e4659f6bd7f513123e9cb4455b21b0bc36082957776d87fd8f9319589398cb03b5b60c961ce1731dd58407bb SHA512 580c752fba025c59c522d5d9f9496f2893351ccda92f9f194b0e9ea4ca926a3ea89e43174b8d03075f2330d7d3051d1d05f864c78cfbfaf92742a33980117718
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20190609-r1.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20190609-r1.ebuild
deleted file mode 100644
index 8daca9ef96db..000000000000
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rssh/Manifest b/sec-policy/selinux-rssh/Manifest
index fb3b7f9c3b62..8caac1446131 100644
--- a/sec-policy/selinux-rssh/Manifest
+++ b/sec-policy/selinux-rssh/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-rssh-2.20190609-r1.ebuild 275 BLAKE2B b5573fc27f907689b62fee6bd1189e389a995671557e2e946d485c0df94c7679593ce1387b3be93ffd3dad141375746288c47988929aafb4bc1cbdeac9e1203a SHA512 881f12332a6d52f5db80acc615e2130c23ced20a7464a870b38f8ea2441dac01b2dedec5252f214fbf31dd44aba7b5b77ac5c9c35c81f9dc677ff197fa1d5214
 EBUILD selinux-rssh-2.20200818-r2.ebuild 275 BLAKE2B a9001401dc172a0dc41cfb814f060c4848df4d2b2b5b005d56581d5e175580d261be3a11552c0995c34030a998a4a9eeba360633ed6dfaf7648e0b9508dd4be7 SHA512 b179e90d8cc8dafd856acaa172fd8ab1b645983b1df1d7090e4a8ec211553dbd2ed35f6dc8257a2bac79734f2c316eadd142338a3828588a708de99f8a5b281b
 EBUILD selinux-rssh-9999.ebuild 277 BLAKE2B 5935810bb354813a8710582320c238130d42f9cc25b32ac0154252df72f6660e0a26c4be78ab62029bcdd0f20c5ba1d0fd1952819004406dc079027619f49d6d SHA512 b3cec9b39b19fd528b93d203e64a51f394ade98d704ca99a675d60252070b85ea15514193dd094126ea341279801d1a44583920b983bedd7a697c0daa9ffe377
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20190609-r1.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20190609-r1.ebuild
deleted file mode 100644
index 755769e528e2..000000000000
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rssh"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rssh"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rtkit/Manifest b/sec-policy/selinux-rtkit/Manifest
index 31d502e1aecc..ac2f3c11d441 100644
--- a/sec-policy/selinux-rtkit/Manifest
+++ b/sec-policy/selinux-rtkit/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-rtkit-2.20190609-r1.ebuild 369 BLAKE2B 5bfa4d06cd51743a4c2f4e47e51ff85f6beeba6d5a4a2cb9b31121533c661acef9b71c08a4abfe3ab0144b6e73d4df8adc9da8653a9e10f0562c236a3608c485 SHA512 dd9a2fbfbf47bb235892c2ff465d9dbe9006d258898af9276a909a0209d26b3cd7f5400dc4c1b3bfe3cb03da93d49bcc53e29f69f4f957ec91694eaf2ed84bd6
 EBUILD selinux-rtkit-2.20200818-r2.ebuild 369 BLAKE2B 5ed67d35e9d22a1515ae25d1f0134b2db1ccc27a83c613adf1f0fb1a6ee9a244046a95dc92e23edc02e66c4a06041f4500c1bcf3fd7d7bd3aed5996696a334a0 SHA512 488440e4c5ecc768ff76bc3200772a352837de58eb627977d25f13e5082a0fcd4503d5b08263e81faee9616a0fd33f673a680fc3690c50b6058fceb7e2a50e3a
 EBUILD selinux-rtkit-9999.ebuild 371 BLAKE2B be4b119e843616d3d8b4ce8bf428c966135c2910e6a6be91fc413c46261ec5d5762ce9742be53224193e411bc3e73e921fbfa9d2a58697fc14f6b9dbf6423822 SHA512 aa2b582044f075ba3c8845a14777d18e9f4af935f33355e46d21f8756fcdea63b9b3dfb262b9cbbb5fbfb7a9750cf6cc74b2531f3926fad137852f0bee283e93
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20190609-r1.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20190609-r1.ebuild
deleted file mode 100644
index ebc3d3cf06f6..000000000000
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rtkit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rtkit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-rtorrent/Manifest b/sec-policy/selinux-rtorrent/Manifest
index 43ff3a176fb9..31f67c954c33 100644
--- a/sec-policy/selinux-rtorrent/Manifest
+++ b/sec-policy/selinux-rtorrent/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-rtorrent-2.20190609-r1.ebuild 283 BLAKE2B 20863745b3fd14c2529d67710be8197d088ce19068f19d72c6e966eb74396bf447e1017718573233360a53247b203adcf1363e95e840ff9a9657164d0cfb8cc0 SHA512 3ec3f2fdd3486472e6877f15b934416e110c43046a4bc704cc9b4b399457a1683576ca71315772097b5a9ed87bc895f6adad29665c113f2ef19931e2ac62586d
 EBUILD selinux-rtorrent-2.20200818-r2.ebuild 283 BLAKE2B 7792a3c2b8cc71b42c11ba067edc94fbf21487470406ab448df021a5287e28b2fb26a6e67b563f499d96906b8d7889558e48b102f3a102cc85e58051f94584f0 SHA512 8c60580980b3f45b6682fadc2237ed2f45691d35b7e0670fc7ca7148ab0c2b395f95af2a5100dec17bb25003a144198189b67971b18054cc1e9d10473d346b96
 EBUILD selinux-rtorrent-9999.ebuild 285 BLAKE2B ddfaa5d0b5c4b868d7ba0424a6852dc5f5a98746c30dcf518f48931d7b24b3cbdfd848e9be969fd5df462591ee2d53d6cdb631748f96135445dcb1b890f64729 SHA512 d2f03e64e10bae96ced691ec1c2f10597065a4aa294de137e3047f06e01465fff961c150e3c96ea8166300fdf6e310ae44c8abc2cd68e70ef75216fb0c5fb72d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20190609-r1.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20190609-r1.ebuild
deleted file mode 100644
index 901fc63de3c6..000000000000
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rtorrent"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rtorrent"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-salt/Manifest b/sec-policy/selinux-salt/Manifest
index c40205ddedf3..57c33210d1a7 100644
--- a/sec-policy/selinux-salt/Manifest
+++ b/sec-policy/selinux-salt/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-salt-2.20190609-r1.ebuild 275 BLAKE2B f04eb70cfab112cfc073f6e9b777eb9285ec34efb970f61f09eb1f7350be98ac2f1702875dc499331e1709c9a2d743892e22d18381ab0f9f9ab441bf22446a61 SHA512 710b5e57bbe32eb0de27020e143df22082ff657070f756d65bf6f31601c21a3e63ed7198a4359887f01a305274ba3427705bdd757603f27e195b5a81321ff914
 EBUILD selinux-salt-2.20200818-r2.ebuild 275 BLAKE2B f4fce10036c3223662e11fff6d50a4f81bae5d79bf02f970623c4c9b6679b2a621feab6543868e585b31b6fcd3a7bf39c9d7d3a1c7891f8ab4baa80b923e828c SHA512 471d0312e129f04aadcab04fd60bb27498ed343559384a5aa0dfed560b37c4acd6a8b709c7987db5caa44de2043d7dc44600f0202a793a7aa80ffdfeab72c616
 EBUILD selinux-salt-9999.ebuild 277 BLAKE2B 69a0b8b3c6a61d33a7fd3414b6e0ea508d3947fe3339b49da055cd7ee5bec7b2a2050082cd42cac3ed298efb0c79c09cfa7ad466d10d94d2d4d2596804bcad28 SHA512 728d7fe072496f375b8b99f9e952d9b40657a0e39b80fbb59302675c621be50236881afb49fd0420594370045a00e128310197531cc9ed566ec83c52d8eefd61
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20190609-r1.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20190609-r1.ebuild
deleted file mode 100644
index bca578fc21d4..000000000000
--- a/sec-policy/selinux-salt/selinux-salt-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="salt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for salt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-samba/Manifest b/sec-policy/selinux-samba/Manifest
index 9e718532b22b..d304c28a0b16 100644
--- a/sec-policy/selinux-samba/Manifest
+++ b/sec-policy/selinux-samba/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-samba-2.20190609-r1.ebuild 277 BLAKE2B 88cb059e3026443d8403aecaff9ee2f6a7de5955215f690e1bb33ee625bda84728120565c119a6f95a1568d32c08f5cdcf45ceb35c68236293a516340e6ea0bf SHA512 c03c9efec2e6ec01a3875f0d1e4cd82fecc2d816504b6f440aada9c060118d8ec4ace7a432fbd7272fcdc5afecdabe1a2af19dee78618ff259bd2f6a823191f5
 EBUILD selinux-samba-2.20200818-r2.ebuild 277 BLAKE2B 412f5d0441f1998d4fa5cfab9d104abd3731a4187aa5f24742cbce55fa664de2cfd6abb6cd237859fa0726dae37e13bb93f23423c0e981ad43cf4dacb845f482 SHA512 6f681d2b1f8163450cb8c1aa7be74cda16ca3f9e388f2c59e8cf31bfa45b2b6500ad53b205b09fdd7b9d9451c9418eae136612d42f08cd167586da116cb0c9da
 EBUILD selinux-samba-9999.ebuild 279 BLAKE2B f23c8083af072087c0f4ffccd69da914dfc2c7ea3200e5852666f54b6250c09dc547ae9af0db57d054e06f720c9a0c09094ecce6114433dba6d5a3c6f3e809ec SHA512 39a87253f4454079cbef14b255c52701e645a120fd9253cd5ec900e11f7aa98612abd3c8ca0ec8d61c7c47b8a151b719fb01f30743be63fc04a949a6b54a7f81
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20190609-r1.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20190609-r1.ebuild
deleted file mode 100644
index 618fd14b6b47..000000000000
--- a/sec-policy/selinux-samba/selinux-samba-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="samba"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for samba"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sasl/Manifest b/sec-policy/selinux-sasl/Manifest
index e1c2cf32ee50..baa10f158237 100644
--- a/sec-policy/selinux-sasl/Manifest
+++ b/sec-policy/selinux-sasl/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-sasl-2.20190609-r1.ebuild 275 BLAKE2B 9b00429d7622ae32bff528f572a1daf593d92141b9ddaf92e9724f7f673ee8695cb5fae8eb6cb96efa2c7fa66f72fa59fbc7719a006a64d7a4345963bcdbbff4 SHA512 0a5e2cd1c277f53b4d933043b6e07d22036357188a37c7643bf61b766078ca0424fb29b03c27d0e10a7c6322f0e1875b6d2c0b40e9520472f978454e584da8d9
 EBUILD selinux-sasl-2.20200818-r2.ebuild 275 BLAKE2B ec0d830f71150c1f7c0e399b57043630eef1b99f154d2cfed0bf8a1d053252db4581fe8857d35d711370bfb87aadfd936fc8537716e533cbdb81e9783abd19f5 SHA512 3deb6a0e77a03c9a1699a922d249d19d79ed0f9db223c46d0d740fed99b6a1e526c5b8d661bc796b531109903a0080a8e17970769a8592126837934410105433
 EBUILD selinux-sasl-9999.ebuild 277 BLAKE2B 20f54b1b60d4aa2c90f012cb9024abbf3b184dacfcf6dd0423822da6a8c16a82c85ad8cb0966444d3ec47982329979c65a1ffe715a0425f374ff3af45b275b56 SHA512 b676fd29edf60906921ef54afba5d8aaa1e3f176a8f4e556ef0dacd8d470bf1581af6e9ea3a29e14ee02ea16efef9543fc0343d99fe2e37076cbde03fc6d286f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20190609-r1.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20190609-r1.ebuild
deleted file mode 100644
index 52cd1ae23351..000000000000
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sasl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sasl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-screen/Manifest b/sec-policy/selinux-screen/Manifest
index 9eb32f38d869..4298a1b7bfbb 100644
--- a/sec-policy/selinux-screen/Manifest
+++ b/sec-policy/selinux-screen/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-screen-2.20190609-r1.ebuild 279 BLAKE2B 72da60f4b348baa52f7c6c64382e8513601383c47d79ef055390a5a202640c022d6d019936f08281a660ed4f8cf7dec0e3dada6b2aee6e9a87b67fd69986b22e SHA512 78909c24917c8390078fbd7b25adc0d56f1048023b214187d3cc13ecb2690f6388b6cf102cd502fce173bb5d1118fbc86c42da0c2c020f0ae87f1dcd277f7b17
 EBUILD selinux-screen-2.20200818-r2.ebuild 279 BLAKE2B cc91282c3d9cf97f708128f4c18cb33c4400fb370daebc0845b09b6bc306f898546fcd22ebb2e1178eb94b21c8536d41b0b71d677c6f55bf998ac086fdef1afb SHA512 a18322eb845d136258e2f941ca432cd7d7b4735616dc528537e63fa58dae1a78ccd79214789c1bfccd7f3f36804d0cf636890e14fc29b26b3fb87edd31630e8a
 EBUILD selinux-screen-9999.ebuild 281 BLAKE2B 9f231f41ef3fbd55a430b659ef19bfb991c61bed27eb6cd74a5946ee19d42dab0830b39a17ccf87ab7543fa0c7ccc1257ecba2b2038783a9050a839d4d5f4318 SHA512 2751869b955b9e62c6857584befcb26292bb1a94bef8aaa0e048867ceda176cf5a205e03f9985a2d119a1db9ebdf69e3255bb03c31881a221212b5aef9f7f07f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20190609-r1.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20190609-r1.ebuild
deleted file mode 100644
index c44e2cb133fd..000000000000
--- a/sec-policy/selinux-screen/selinux-screen-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="screen"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for screen"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sendmail/Manifest b/sec-policy/selinux-sendmail/Manifest
index 4d66ea465a9b..b62bac70db52 100644
--- a/sec-policy/selinux-sendmail/Manifest
+++ b/sec-policy/selinux-sendmail/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-sendmail-2.20190609-r1.ebuild 283 BLAKE2B 4870efd8b8279600e3e6a57dc99fb2ba051005ace385a49717431063036ace40760b645e3663ca5004eaeb614aee3563a85463704bc6a0bab98a61765dcf588f SHA512 436d50b5aaf3d2fc2cc77d574bb64a986b4daec4ba6449254a528b5528fad28cd590cd9421d7e53a3e5ab97286d97b6dc2214100cd470f1a228e83b7e974a9d7
 EBUILD selinux-sendmail-2.20200818-r2.ebuild 283 BLAKE2B fd72bf1316c4d84637d5253d1f59f7c56c4e6180244b57c63de2db55e1db033af3b7255d03425bd37d4b5fbf200972359dda96c372011457480f56547819f180 SHA512 8fb706c31f052dac4acc86f607994f5d0b1c5aae2891639c79096b8fdf1a2fc22153852f38431fdcd49ab710816568927b601ae14e815372f1a489602b63f20e
 EBUILD selinux-sendmail-9999.ebuild 285 BLAKE2B 1add445765a033a3a03133f7041bd70814a5e3f780e687f327d565f38c055f72a9aa272e29597674a65e8156084d41d85cc7291649a23f6976debf0cf84f1a7f SHA512 63e67b488efd217981eb8ccb32a465e872691181e38277866abddc0816411562b69272530fa34a8148215f38fd26646acb86434a251018bf8338e7bec4b92588
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20190609-r1.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20190609-r1.ebuild
deleted file mode 100644
index c2df25cda294..000000000000
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sendmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sendmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sensord/Manifest b/sec-policy/selinux-sensord/Manifest
index b4224736b84d..33612659e716 100644
--- a/sec-policy/selinux-sensord/Manifest
+++ b/sec-policy/selinux-sensord/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-sensord-2.20190609-r1.ebuild 281 BLAKE2B 8d93a3540c6b5eee06cf0787946d71e75a32e31bfa8045a7b112312cb23bdb3a2ec9ead9707f165feef5cf3357b8d20cb4e1004f5d04be2b789857463d664047 SHA512 1f55e06b99655e463010f57ac9dbd78cda68ee8bfa04639bc3234fbad76d25b878335088b5f954ef333bcd306286e92a9c914552f5581879bb2f3befe3863d6f
 EBUILD selinux-sensord-2.20200818-r2.ebuild 281 BLAKE2B 8099890ce6a53580c0b17944264efa71be6ab835c9ed0aecd0d604b2762fd60584fac6de4f5bf47f25560faad76234dbbd95a36c0aae7eef5735b36b16a35dd2 SHA512 b762b01a961ea3e7e16cf1d881320f62985296fded804fd646803ebaa6a38544e4926f617829546035ee799b7f2ec90e1319421feb20920da01306251f5fd8fb
 EBUILD selinux-sensord-9999.ebuild 283 BLAKE2B 225ad544a42e9fcaec24d8b2212b97a82458f2142211e8ec802f7991661c982bb930211bc55ca5c02287bc49fdbcae33579779501a1b9c6478cae86ae507d9fd SHA512 a594644aa7453607f42530ffdb998f4163c8b09667f612a423cc4269395654d2d84457ecceec1ff3abca8242bfc0ba680ceec42774288a6d0a8e81d91c46b6e1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20190609-r1.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20190609-r1.ebuild
deleted file mode 100644
index cd5059fc9d7a..000000000000
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sensord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sensord"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-shorewall/Manifest b/sec-policy/selinux-shorewall/Manifest
index 9ccf636c62ab..ccc8416e366a 100644
--- a/sec-policy/selinux-shorewall/Manifest
+++ b/sec-policy/selinux-shorewall/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-shorewall-2.20190609-r1.ebuild 285 BLAKE2B a654b02c22fd5d094f1ae4057fb413829692ebc3d59e30d28b6d508bd8460d03215a0dfde6fface76aa6845bbed89e7c1ddd09e34c9cd2d643c5ebd7b4ed90d5 SHA512 39533ad8dca1a4c07e3007830b79508df3cdb9e9b4ca450e05c2ad3ac2de107f1221fc09ffdeb3877dda8d2a0c561addcb75d35ef44482bf3c20e6bfc7ea8649
 EBUILD selinux-shorewall-2.20200818-r2.ebuild 285 BLAKE2B b217692a08b086f870a4be8e16aed04af466c4b831dc02228035c4176cfc197d00108abbe9172f4bc2a898939ca219c92d623b71d8ec878b256e1441d6499989 SHA512 d5ce975923fe34bfeb1e018fb15cb340f82d3df2dfe30e4f6ec12a999ff12ee81f56241ec451961ae2503e2e783a70232103bcb521366cb053d2e3d9aacf8f0b
 EBUILD selinux-shorewall-9999.ebuild 287 BLAKE2B 37ee1c81025af04b997cd1dbef6c8c4add4e1a90559fb72c23307fc031e971def74873adc5b302de6e9572b74bbb5b40e525977bad5755b10fe43ffe3d8aa105 SHA512 708e15235221bf2fe11e5589cd6c7c09e61dfeb9e790d9c4e9a21bd00bcb3a10177468cfb808abe7e9073dec230ca5746d88567b2c3b03b5cd8edd80fac652c5
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20190609-r1.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20190609-r1.ebuild
deleted file mode 100644
index 05281937cc49..000000000000
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="shorewall"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for shorewall"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-shutdown/Manifest b/sec-policy/selinux-shutdown/Manifest
index 3f3e9076f60f..ca7624a97016 100644
--- a/sec-policy/selinux-shutdown/Manifest
+++ b/sec-policy/selinux-shutdown/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-shutdown-2.20190609-r1.ebuild 283 BLAKE2B 14e7eb6f288ea0a4bf3c624fb2ecd1aaae328e0379516449a6ef07789a61f51023d7f73219237711b34420084edd29b3984d5c2223fde40be808be2999edaa9b SHA512 4cd508eaed6be39ad3b4c3f6f1e98e071bcbe4cf953be6d970756efbe49e8ea0c110c30482450280fe1f8257660cac1823aaa694f1ff7db6f264cdd53d679850
 EBUILD selinux-shutdown-2.20200818-r2.ebuild 283 BLAKE2B e030702eae7564110d52e24346fcba388fe46f285de54238e8fe8d53b2d936c671124e997f690965fe099473387cf97427c3a13c5a029b84acc1e66f007f4316 SHA512 bb33ddf4097474995ce728a2a399d3ad261630ef84dafa4a1fa128e44dff24d37d530648dd88b627318c82b1b6a6d103c737b1630988a8a62c756ae2a96e54a0
 EBUILD selinux-shutdown-9999.ebuild 285 BLAKE2B 7ebf8a89fbaf80fdaaee074bcfa15d72cfc68517e2ef3dfad8dc76e349c07a0d93a4444e9601476ffe23f7e15033e3b6babaed4f470bbf0c622766a78796f47f SHA512 38d4b4c8f1fac9f8bd89844fe7aa9c0482fd111bf81826e87c03293de769af5d32b57efc61997cc3bc19ad3c3e20255ce380d66ccc050ec01e94e34de062bfd0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20190609-r1.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20190609-r1.ebuild
deleted file mode 100644
index e2a1e5b237f7..000000000000
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="shutdown"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for shutdown"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-skype/Manifest b/sec-policy/selinux-skype/Manifest
index 7513e732e789..28acba2d6f39 100644
--- a/sec-policy/selinux-skype/Manifest
+++ b/sec-policy/selinux-skype/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-skype-2.20190609-r1.ebuild 379 BLAKE2B 5fe1b376770afb508566cb8a4c490b5faf571ab1e3d13d521debdada55657479b8886c67b001b06faefdbc30d4ff16abc6ad424909cbc3007be88111e77daac9 SHA512 13dd3675eb8349c9ed5986c8f1f078d73fdabd852cdb2be30b120ffaee6e2cf3f88d1af707581c4dedad68451e38e2edc6b08db425a13c85985fd6c37092abfe
 EBUILD selinux-skype-2.20200818-r2.ebuild 379 BLAKE2B fc7523ad162e0fc8f6e21f264cd4e508befb70bd6d2e146d75c0b43a57e160664d2d346cc67be90d9cee827cb6758b411e46db4feca205af63f19d6ea2f1b10c SHA512 5f698f90f5309d22c36a682f664fcda627eeada1d621c645b32598302bc1db7cf1d44397c85895da33814768ee9523900886910ec7aa4391c4b11bfe1b779a11
 EBUILD selinux-skype-9999.ebuild 381 BLAKE2B 68f4dd26c3e8903bd921d29d8fc1dd8ba0b577107c2c63d4c32bb124b5bcb1e146b089ef32438cdd4133cd5b13623604ae8b1cfb065dadef0c23f2799fcee66e SHA512 b1088feda9bce9ee9b14db1815dbf44a8626c36ee08d9eddf9dbd1763675993740af7217194f5b36be75517ad1c8473b1f262b7fac8ec1db47124b005f14479d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20190609-r1.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20190609-r1.ebuild
deleted file mode 100644
index ab8db9c3022a..000000000000
--- a/sec-policy/selinux-skype/selinux-skype-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="skype"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for skype"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-slocate/Manifest b/sec-policy/selinux-slocate/Manifest
index 1983554eec1f..22f553a16003 100644
--- a/sec-policy/selinux-slocate/Manifest
+++ b/sec-policy/selinux-slocate/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-slocate-2.20190609-r1.ebuild 281 BLAKE2B 5436328f3845a2529ccd70a9e9ad8e745968c08c4557f991f7773598744824c2d4e8fa03eeb75788104403b33914f601ae48d8e536086a7e7c82895edd9c4635 SHA512 6b64dc152984fe27eae3a5e65cebc7013fbe4b5b385dccac827702e60d9b5871594db1e4b0106e1f0bc297d76fcea78c272c8c154069158375be52353f44017c
 EBUILD selinux-slocate-2.20200818-r2.ebuild 281 BLAKE2B 5a4a786d51cc009c2ffdbfc039880dd9936eeb5a0ef272ceb0fb53b156e6633936a085adef5126dc8350c7be74e328fc182568ffe6b12bbc5c4e92c61f70567e SHA512 78d750d0bbf7cb05947449fc4448447f404d00541db5f56c75288ff1532a1e12802bf1993c8518c894a17d2ef4ac4bf94beb948dc731981408eb8f5d0808dacf
 EBUILD selinux-slocate-9999.ebuild 283 BLAKE2B a0db46ea0995ec6dba2e712abad4e3a2a10aa5ccdc653388f2c4d73a117fc1cd3a883374ed97cb71ad0a72c2511f3059ba359bd2a67468d6b077356d73557b5c SHA512 00fdf4e4d3d2ff8324859e4368f34bf562e04377256e982a38e4a65a0df20de7b0fcd07d3a717fd76113e50610942581c914a2c8ff10a441a00a29673d0071bf
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20190609-r1.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20190609-r1.ebuild
deleted file mode 100644
index f528206f4098..000000000000
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="slocate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slocate"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-slrnpull/Manifest b/sec-policy/selinux-slrnpull/Manifest
index 7aa34e848b60..702de33f408e 100644
--- a/sec-policy/selinux-slrnpull/Manifest
+++ b/sec-policy/selinux-slrnpull/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-slrnpull-2.20190609-r1.ebuild 283 BLAKE2B c99ef8bda57b644dd58a15f668eaef775abe36ded6dd70caef0eace559c25fa22c4c9b4413eda5e804cef80b71c1207689ddedf71247fba0ba25d472a994416d SHA512 3c884424eb7aeb832921e8f4bf33602c38a1384d0f6d75a56bacde41d2bce54b143b65d8cb025d988e2313b7cfee36ce69068747b4f43881dabef2848ee9fa59
 EBUILD selinux-slrnpull-2.20200818-r2.ebuild 283 BLAKE2B a42dfe719b838570de3dcbc53105843d029ac8551979edb70001aa02ca780a734d18031a8ee41b8916de15cc5e40c266fee7a2d4ace6007ce7ff3789d7f9fc1e SHA512 db0c777c4cf96e73eacccfadf1bcca605f74ad523a1020ed6f29ce0e5252b62e0e6129a357da658a4a79c6c49078f3b52a3dacc2ff6b6b5fe4ed2dcdab5defcc
 EBUILD selinux-slrnpull-9999.ebuild 285 BLAKE2B f6227d5f61422e84cee50255b61231a1f0e6ce18340190bdb56b0f991a1bfd83dac1f95abe3004a9d290dcb825c7f2a6f0eeb948a45a484559448fa7a8d90220 SHA512 188c1ae3df38ed391d598d7a3199046fd2a734e32f597c4064b4ac73e8b525df5cf767b680d506f1696bdb6dee472760f0c3a61e64d34334a42876d8afe4a6ef
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20190609-r1.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20190609-r1.ebuild
deleted file mode 100644
index b35c57cb8e0e..000000000000
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="slrnpull"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slrnpull"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-smartmon/Manifest b/sec-policy/selinux-smartmon/Manifest
index d2d998f768ca..f067f84c1997 100644
--- a/sec-policy/selinux-smartmon/Manifest
+++ b/sec-policy/selinux-smartmon/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-smartmon-2.20190609-r1.ebuild 283 BLAKE2B b678b299ae6584d638140cf297b4daecb10a96de098f4e8ff52ac6846ee8166941f79da69bd402540d5af1b8c0f24b3f1e4630b738db70b0de561da41fead58b SHA512 264f2784cc85e2e178be9b3f941680e69633124889932bf3d39f9c02068b100907556053117b9b58924f22251bf6579e63ec29b93fc371022ecdb7c0b373dd2e
 EBUILD selinux-smartmon-2.20200818-r2.ebuild 283 BLAKE2B 421a28ca5c9ebb7212c138ee540a151c81dccf89321ef61da122a0b059f684bafd2b9acbbb78b43bef633ca8304e9c050c2b91592d19a6e771a6930e50f051e9 SHA512 fe8acc7fa095196ac66942547ea8c44dc6d85afd3b2a6d9a6ca10985bf853fe1095ac192462bdd8143a7bbd3b9a2e632e7405283d770ae40b726dfa00f169ddd
 EBUILD selinux-smartmon-9999.ebuild 285 BLAKE2B c5cd058454fb1a7a160a4f01651af1b7aa8dfdf2f5ed93ad6f85d7160ce47d6d8fab7e67606d82112fc95028f7b914b9221b9cd8e3121b4a70895fc98fd5a4a1 SHA512 9cb26061b6c79c8855988b6c7ed1f1eab0c1d6930ac76772f0b10d9bb149f69b973dd1d414ea31838126e90a7bcfd7b35c197d4c0939ef7e8107b23e906d8549
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20190609-r1.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20190609-r1.ebuild
deleted file mode 100644
index 47f287bf40d0..000000000000
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smartmon"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smartmon"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-smokeping/Manifest b/sec-policy/selinux-smokeping/Manifest
index dbbee26eff09..b79997188eea 100644
--- a/sec-policy/selinux-smokeping/Manifest
+++ b/sec-policy/selinux-smokeping/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-smokeping-2.20190609-r1.ebuild 381 BLAKE2B 1fc869074042b5950ec3c4cca989a3ad665c249c08375dea164d4d5ceb3d2571339dccfbc960d18f479f29a027dd542149627605dea3e569618e9d539e53bc8c SHA512 0a0143271b44f88d8cd0bc87fc5de704d9902e35bc29d8d3a76b94c5a04ab27b4e8db5393face34d2f0436db16fc57606ea9fb1da3afb52ab13e17e07f66f6f3
 EBUILD selinux-smokeping-2.20200818-r2.ebuild 381 BLAKE2B 2811c8b003aa8fb18e97fd01783fc7d60d1593359fdd7d9313b046626c855206ca32301ec5940b07578cb8b25ef3726ff3620f93108ddb19653c8c974c9b01b1 SHA512 da2e1b3e192f555e12cbeb3001e86e4ff8b708f7681706dc52452e5999efaf23867710d49bd8eaa7258e715d93292caf1a72ab7f336bcf069163f13602944b2a
 EBUILD selinux-smokeping-9999.ebuild 383 BLAKE2B 015f454b59937e967026d1ab7b67c889dde29f30eb04e4324e0cb18c8dc2df00df4f8bd40598e3225679ffd338bfb76515f478b32b5c646a2436ce685a60d3ef SHA512 67a832cf238f9f277e6485a1d7d97a37251ed766d76f71e19a9366483d4b63827f4370ee19f9834e0000e956be9d9d89c7af965fae25f9525cf02370674bf1d0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20190609-r1.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20190609-r1.ebuild
deleted file mode 100644
index 72e224ffccae..000000000000
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smokeping"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smokeping"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-snmp/Manifest b/sec-policy/selinux-snmp/Manifest
index 2f6592aed744..437e89f4a9e4 100644
--- a/sec-policy/selinux-snmp/Manifest
+++ b/sec-policy/selinux-snmp/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-snmp-2.20190609-r1.ebuild 275 BLAKE2B 73d27a9fe629e4365e061a38e88b2350a23f941bb990becc85966f1d11dac56b38bd754e8de91848d0e05f5953fb6d20edbbd900fc281c12dfe0385eb848a7bd SHA512 f2a522d2bdf6f91a1666eb887412f3ffc9901a03d41b6fe1bca4fa5cba62bc12bacf0b2b0c140577d69b0619ed767949a3ada364c66395dfe5b16f543133b229
 EBUILD selinux-snmp-2.20200818-r2.ebuild 275 BLAKE2B c471e4e84c08b4cc465178dd5f664295aafcebcb99f99f7c256895d0cb5c4a5f9b08942d149727b6389d99f84f4c899ad2029de2d57a7a1784c335b68e0b316b SHA512 ca06a5bd6794c0faae799253f8fb03b54ce09986d19413c04b96342039cd9b139dadd5ae57395e424d3a1a3536420f3138f9057b9cd45401375d8e04d264bbb5
 EBUILD selinux-snmp-9999.ebuild 277 BLAKE2B 4ad02e01853129c6e9e6df414b5434f0e86006ce5fc1e51b1a6c735ea202a322b5e8c5bcad40937197e2f71b188d565d85b7208f76a9bfba94097e1871fc5f8a SHA512 3ee41f3fdb98340759967058f535c3f6adc1c85b99643ac60f0992b5ffc46713c3306c92ea993dc5c6b8870e242a58775364cf98dcaae5dc26dcc7a630c69ef6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20190609-r1.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20190609-r1.ebuild
deleted file mode 100644
index ef3fd5c05495..000000000000
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="snmp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for snmp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-snort/Manifest b/sec-policy/selinux-snort/Manifest
index 0cf3df4e2bb5..5221e35a0124 100644
--- a/sec-policy/selinux-snort/Manifest
+++ b/sec-policy/selinux-snort/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-snort-2.20190609-r1.ebuild 277 BLAKE2B f0485ee3cb9639eddd2c68b5406ba792c141649270bf1ec38a7a13247ea5bf3f19aae0eea69c502d83d02852a5348f75effb2e17da67d1100e8a9dd36ebe7136 SHA512 3a0368af8c40876a94234e2cf766a29b60aa4b090aef9782626001d538e640daf7ddbdd3d19cac56fca260f9c585c1210c8d2d71453aee64ef5cf439f05226c5
 EBUILD selinux-snort-2.20200818-r2.ebuild 277 BLAKE2B e4c1fdeb947f5cb87a940529cb242aa8a3ff6e1f6b53e84d11841cf9e1bb4365ab14ba391929ba6f592aa8fa8d5a383207af0a41f37645fa9853fb0054225631 SHA512 efc238a1c73ddf9cd695ff427ccfc5a6d76ec104dd48c5878ef12887fe7adaaa5f9470da642527554e0a3175470b630ec147848e4026048f7e76319c58a4a661
 EBUILD selinux-snort-9999.ebuild 279 BLAKE2B c4a0bbf21114f71bf1adc80c0ad543e059695040d64c54d78f9bacbac0031c99fdc0ffb9c31e138e00226f5849fa64711601c31c5187d3dbe86466b62e4e69fc SHA512 86c698c823671c9e4407c41ce2d6743b6caef7cb28c33b8715ca87b133695f4be7799a931d108f5a07c039e6f13b9a5b88ca81d10fe2048815f24cbed27af209
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20190609-r1.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20190609-r1.ebuild
deleted file mode 100644
index b438d449d2ae..000000000000
--- a/sec-policy/selinux-snort/selinux-snort-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="snort"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for snort"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-soundserver/Manifest b/sec-policy/selinux-soundserver/Manifest
index 58aa8430998b..b38237348360 100644
--- a/sec-policy/selinux-soundserver/Manifest
+++ b/sec-policy/selinux-soundserver/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-soundserver-2.20190609-r1.ebuild 289 BLAKE2B 2c9808d59016984e3245f09f5404eedf4d68e8b52a8f295f4a57347aa27a1e791d5ddcbd3d0e6aa586ed63d4528a2f9ef58bf43754452e641f8d4a3bf96bb6fd SHA512 5856ffc33319933e8491a4a453a86cd3b9c50acc3060390492aab9873a62d19c386f9654c2598125d141a5c715ee6b43aef78a893929ae96570a9709b419be11
 EBUILD selinux-soundserver-2.20200818-r2.ebuild 289 BLAKE2B 16715e01507d4ae560dc4b3a05e81308bd43cb9f6a47f92c847bea46b454c423ba867e6408f8f30af27b64ba92ac47e61b17ae09a0a82c6af7e5bab1c08b4995 SHA512 9d793b87edabbbabb17d3309ee25c690f7f7c1f855138ad59c0b35dcd204e1bc6372f97bef6fea8188232c1c0912636bb75deb550de113141686d2fb77ea00df
 EBUILD selinux-soundserver-9999.ebuild 291 BLAKE2B 421c0a85530d2faaeab63864e00a43f44f4955fedf2e344692745d13fbc467c4a8d8879fa9526acf4ea65d825a0ae28ffb4caf82022d78c20cfb8885c5530537 SHA512 59445b62f04d29dc3c5c68534a6a3e2c0cf6afc5dae59aecd49e2b04a2bc4b1b290ed40140ffccb6c86aa65c2f9612d62df940018eedfc50a895ce75df39f8af
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20190609-r1.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20190609-r1.ebuild
deleted file mode 100644
index 429a4df4015a..000000000000
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="soundserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for soundserver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-spamassassin/Manifest b/sec-policy/selinux-spamassassin/Manifest
index 2da064d3eb5a..8ed9f18f3655 100644
--- a/sec-policy/selinux-spamassassin/Manifest
+++ b/sec-policy/selinux-spamassassin/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-spamassassin-2.20190609-r1.ebuild 291 BLAKE2B a338ea5a5672dce881eaf9e52dde1eb336db50f392767338f32a26bbffdb98ec12efba30946e259215dee21bc18b942bbaa1c45299918fcdd5f41ce6bdf17c16 SHA512 7bd54a5250064423207150241c5eaba746d6643e2388bbede7e653c69fe8126327c1cf0b0ee0e4f88d4bcb15ccf69602823f336265e2aec42f27f8c7f6077940
 EBUILD selinux-spamassassin-2.20200818-r2.ebuild 291 BLAKE2B b42ff8311f3f21e3ce2593f26a69fc720ecbdc6bee59f85f1b6084f9115810aa7b1280d52aac4edb16a70f63a3d7176de6e178d01c1f0ce1125b5d1ed1385fa7 SHA512 a0b214f1584fa94803b03e7ffd6072746f9d3cb5c67399ac8c5a984a449255ef39bfeef10e1801d589f8a9835761d901d8f0f8b7c6df71e02c165fdc022d8411
 EBUILD selinux-spamassassin-9999.ebuild 293 BLAKE2B b10ed0afa23de8c00552b305ef84dfcf00217be3b06fbaa82c13ca84b9d60d580d702c6c99ea552993b1adc5439f1124d750d50b61ebc8215353da9fe54d6a23 SHA512 daf23f414504bc989f69b49dc603104962256e71f428b4195549245669161eb0ed4f89c65181f18b6b1dbe00d182f7bf8d07b9420052f05ca57dcab24b72fc56
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20190609-r1.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20190609-r1.ebuild
deleted file mode 100644
index 70e5162f3498..000000000000
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="spamassassin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for spamassassin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-speedtouch/Manifest b/sec-policy/selinux-speedtouch/Manifest
index 9eb21695b0e3..2ac146159335 100644
--- a/sec-policy/selinux-speedtouch/Manifest
+++ b/sec-policy/selinux-speedtouch/Manifest
@@ -1,8 +1,4 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-speedtouch-2.20190609-r1.ebuild 287 BLAKE2B 91b7c9d71e494f8abcdf6bbb23a4043eba586839998cbb51baea2167d938f9d26194938f58ab08dae530a7ee746370aca56fc4ab3116012e980be73db5ae9f3a SHA512 2bd3a369f45d26502c3f343200ea9295b2941998f625119b9f7988044b237251422f3492fb85a3582646f702ca08eda6b63574baa1d9ea2b09a8d009ae4459c2
 EBUILD selinux-speedtouch-2.20200818-r2.ebuild 287 BLAKE2B 4cddfa8b833982ae1602700620127e4a8917f93ac4be9ee8026fad6655e9e3bb64690f8cfb67f814532a17d1bc140afee7b2813a2e01877a1f1d284e13ae72a4 SHA512 ed71eec4ebc4cc1ab8768669ef9398fd7fdfe16486440fd5c108e4735ef21ffad8f63b8218dbd2e76b30f27981c94a0c212847f5b79b1991555a843fcec6400e
-EBUILD selinux-speedtouch-9999.ebuild 289 BLAKE2B 6cc84fee788a4694505241209d437f19cb4e660a942bfb6414a7bbb45a09025c903ce316821d39b36d27d07c23ea4f031595aef45f7f128bb0d64f531c710406 SHA512 170d4cb8cd1b0c3e06eb42ab681e3f0021f459c64b953568f8e47eea1240a472df884c77b835498627af9ac7afa6d8c2c9943102e0103174ea44f35f9a965043
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20190609-r1.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20190609-r1.ebuild
deleted file mode 100644
index 829da81326bd..000000000000
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="speedtouch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for speedtouch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-9999.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-9999.ebuild
deleted file mode 100644
index 90ae1ab45797..000000000000
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-9999.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-IUSE=""
-MODS="speedtouch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for speedtouch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-squid/Manifest b/sec-policy/selinux-squid/Manifest
index 1af14e812b0f..d4b82fd424ca 100644
--- a/sec-policy/selinux-squid/Manifest
+++ b/sec-policy/selinux-squid/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-squid-2.20190609-r1.ebuild 373 BLAKE2B 885e8be9dafaa146bafd587381bdaae448b8eeebea3d2ac01706ed62fd5415874ad39e6843889397e210b9fe67fa7e55409ba177c5904cb991f629dcd6b8ad5b SHA512 825fce44d425433ac28994bc6bdecec3bbefd31534108621253decdd5bbd963b4f6bee345d2ff8c3f900a07766b46334ba1771749adf3545fb23663af6629eb8
 EBUILD selinux-squid-2.20200818-r2.ebuild 373 BLAKE2B 2d8eacb29322102db41cad620da7d6b98e7d778ce4aa89a9ed1bec478481fd34e89cfa564e9545b89b242ef087171474cac891ea01e2ee05c68d5d9d55338460 SHA512 75a5300745daa1877c39cd3b87864a7c27ab782c08bc248dec24474477ad1d0f615b0800c76158434b863c75d257b133d550ab452f5421b32c840c45e1daf426
 EBUILD selinux-squid-9999.ebuild 375 BLAKE2B 2cf3522a7f41340624df9fd3aca52e76534ca8e500212eb2b6fb9c99e05a6ca167890ef42a08285f4c3264faa960d0f7daefa1cfb5178d45146d060ef4c9fc2c SHA512 01ff169efaa407aae83d2c7c773fdebb80fc6beece802542456a8f6b216fd80b5a6e0a39966518d1513cc52f3e33ce79244a3d93b2b68a68920f3141233b536e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20190609-r1.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20190609-r1.ebuild
deleted file mode 100644
index 8dc370ba476e..000000000000
--- a/sec-policy/selinux-squid/selinux-squid-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="squid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for squid"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-sssd/Manifest b/sec-policy/selinux-sssd/Manifest
index 29e6ab48c14e..31ba64223c47 100644
--- a/sec-policy/selinux-sssd/Manifest
+++ b/sec-policy/selinux-sssd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-sssd-2.20190609-r1.ebuild 275 BLAKE2B 5c248ba6396435f5c41598041df096caa7920fb070ebbab9f60697a212caaccec4ff5713decb29968cdf3717bb921126f2b619bcffaadf93fe2e3bc683272102 SHA512 c814224a8376179498d09381ce1f79a6528072e40c63e1bdd51ad1ec6408167e6b61d269461ca4e7dcd64d0499c2fad573413fe69bf7592d0a47438291d5f96e
 EBUILD selinux-sssd-2.20200818-r2.ebuild 275 BLAKE2B 696d6bea1cc669dd1db0a73ea64638947430ab14b3f4735605b958cc3c2a7370e37d94f43751e4bd691e38ee00327751d4e54ea40565391a4522530013eacfba SHA512 24337867459aabed4176891a2b88fc520d2aad13abca739f2a3fecc14e5f3cff9184f7790a352b6edea2ba970ec949e6c9b81bdd44be29d8f361cdd86683286a
 EBUILD selinux-sssd-9999.ebuild 277 BLAKE2B 4f3f53820eee71b03d0423db6f72989bec947e4dab1588274340ddc1a522a3ca45f815f854343acd04a5dd38727d9713578ffb16f637c1e9610309dae62dc0f8 SHA512 90132c6c5de88793e8eeabded480f8e9a163be017f8520c2d3d8ca5bc773a544a36abd9f28106e9a93b16f313d468bb84663477720444850a97d435594f5b856
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20190609-r1.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20190609-r1.ebuild
deleted file mode 100644
index b31faaf2a60e..000000000000
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sssd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sssd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-stunnel/Manifest b/sec-policy/selinux-stunnel/Manifest
index 02cfd31f458d..5bba061192fd 100644
--- a/sec-policy/selinux-stunnel/Manifest
+++ b/sec-policy/selinux-stunnel/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-stunnel-2.20190609-r1.ebuild 281 BLAKE2B 6c6ab57feed40d7726421496a55389c71fddf846467e8ac4ee0007aa3bd97cc94d4aeb64a41f2073e12351dba298595dcd9caa40a19f5f00cb843b25735923d7 SHA512 efad942cd5e28fab4bf0a6b61167e2b1a47d3aa765a27781910edfd6838cb21ff797b14982d4c0dd5f59e1bc6a2a0e90b46b0570f10f0e2ae0eba171592eb8c9
 EBUILD selinux-stunnel-2.20200818-r2.ebuild 281 BLAKE2B 351a29c883297ffea6f3c35e00699bc30b3bd21793e377e4e767dc6d39ce25e037afdf9d8ba53eb660b497a10e33464d9f305ecee43431e72bbe4175d5a483a4 SHA512 16405a36b17c7834d3f3beda2ea7cbed01fc19a3182f7da83438722b12be4c76f51c978c5fb402c49a531d434f4ea097c2711cef400dba32f35c505311941935
 EBUILD selinux-stunnel-9999.ebuild 283 BLAKE2B ec6cb8a1bf903737eccae4239cff8a52e4d6df5d52e740c99db95fa7331e1f9308677e676e3255a0ed18e9215cd9606d67d53bc9dd2c4a4173ecb1ab0252fb4e SHA512 c770f90ec1323d86975375cebc4ec51831fee997823875aa0f1aa8de50ee32d68ed365ab1258df0ef72926366995b6235205e526df85e13a08bb16291663777a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20190609-r1.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20190609-r1.ebuild
deleted file mode 100644
index 87ed5e6a727f..000000000000
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="stunnel"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for stunnel"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-subsonic/Manifest b/sec-policy/selinux-subsonic/Manifest
index 213da00dd96a..5872b1374215 100644
--- a/sec-policy/selinux-subsonic/Manifest
+++ b/sec-policy/selinux-subsonic/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-subsonic-2.20190609-r1.ebuild 283 BLAKE2B e7306aa02db984d41307e894e19324b22db2f1f512cffcaa90aa00cf5ab79cf7d0f7744cdae472342fe211f767af061c8cbba40fd47a0178b7bf640af30578ae SHA512 13293a97acf3d1fe6db500661d285e9abd1f6c8bb07c1f25c627f07b8971ce1b44d7898d5aabc88377d3c4b38b968e5a4fc436afffb34e73813e0300dd7acbb2
 EBUILD selinux-subsonic-2.20200818-r2.ebuild 283 BLAKE2B 1a0d94be5929b94f5aaf2b22b7d3ec02b6f442bdce483ff29688b5fbdf87cee177dde6814bbfe8ef476998403b3fd9d52c43488a10a50ac150ee864a0ca727a0 SHA512 cffed24077f333e7342f651cd35159d491a8ce0a8b2e108e802ad5767be3535f78a4a3b0afcd87185ba49e9a839d447dffd883ae17eec444b4f6e951a76967c6
 EBUILD selinux-subsonic-9999.ebuild 285 BLAKE2B 067ac606cd06226e5f33bd5be6b9ad8f7a951349b40e6d6f5e7ca0285f7947bbc0f6a1c1623890885dfdbfda605a7a434d9f12179149184a5e7bc86606e67a2e SHA512 8a643db8396c740c489348f0e099f4a2a051e2e94f6584ab18af353fad184569bae4cfd42f96c8719c46334c9c0bec4aa1498a5629f2f9f2275f1f777bdddc82
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20190609-r1.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20190609-r1.ebuild
deleted file mode 100644
index b2397d0e041d..000000000000
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="subsonic"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for subsonic"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sudo/Manifest b/sec-policy/selinux-sudo/Manifest
index 2988531ff1ca..e38d81b489a1 100644
--- a/sec-policy/selinux-sudo/Manifest
+++ b/sec-policy/selinux-sudo/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-sudo-2.20190609-r1.ebuild 275 BLAKE2B 6e7928aada5c94058dd1b9f0b7508718c56404e0d6ad980eb43d3a5325bdadc24bade31fe9eee11ef00b44361ca1bd3b31f9b1687882c9c45df698d4dd4b80a1 SHA512 23d4d3f33c6aa11b393d97c5dc5c1c5534a4a4ea5ccd1a2a0a068c36ad709469b03dadd3cc972b2d570c46458fded80707e2855f87134e76419c114827c74bcd
 EBUILD selinux-sudo-2.20200818-r2.ebuild 275 BLAKE2B 7d0d466173942207a0499e6f3f7f683925b4943c6cef888f36fdbeb2556a545537f1c7b87463077421f51c0af6d299367eec2b1be0a66153de4b92a93b4f3fa6 SHA512 3a780e03925070fb7e9b1a05f232e125245407ec69a03776c39c8eb7415c55e9e7f668850d260c712441080026b29c877ecf44291ea521414f30767dbd186d7e
 EBUILD selinux-sudo-9999.ebuild 277 BLAKE2B 16ce64929e586e14c2df1b0c3c7abf2364e80c9e45c74e6a67e47369cdc1f5b4e85443d138bc0a87d792734cc21371bffae8e0bbe091459d6c38a562ef9e2946 SHA512 e831c31baf64e9baee313572ea02e9828abe527e160b2705c43e824e4337fac8113201e59255db43eca0672f8d64545a302247d8bae80a444b245eba3e5c3f0e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20190609-r1.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20190609-r1.ebuild
deleted file mode 100644
index 3240f526b439..000000000000
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sudo"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sudo"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sxid/Manifest b/sec-policy/selinux-sxid/Manifest
index 9e3a873c622c..e44941a34e5f 100644
--- a/sec-policy/selinux-sxid/Manifest
+++ b/sec-policy/selinux-sxid/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-sxid-2.20190609-r1.ebuild 275 BLAKE2B 68ecbc21cc4f297e1d3aebd753c1e42dd5baa06e6d759ce184f9455693593276eea223d559607af1bf5a534be2c3d307b622f2cf4e64cd31070c019db6545340 SHA512 f3068b1b9ec3413f298139d0f74c03034c903410cb093e994873c1cf6329c3035ae3b27624174fe4386c808a223cd3623fd3e342b2e104768bc22c3a94215de2
 EBUILD selinux-sxid-2.20200818-r2.ebuild 275 BLAKE2B f723c5fa92839dc07c022b63792c85f77f65b3e90e738062712e81c682a678db5e587774b2e11964e04f7fff78eb73457d716d3e049d81a97dada8006420f413 SHA512 85d6869a8430f8989c2774be3382a779b451abbef0dc4ea8592027f1691482c9bf848a1e7d1c9ad0a34139d81ba1afb3f2090ec1864d28253204c43ad499641c
 EBUILD selinux-sxid-9999.ebuild 277 BLAKE2B 1f9056abe8030f43b085ac1dbdf9abadb403f9a4e008a6c9a3573421ab6d2d541fe54ffba5a78807a62839394fc839ab6fa51a9fcd7a870a064eecdc36e7cd13 SHA512 aaadca31718589e0b1cd21d6951b0ae633ace044f3ac8b356f1aa01da1d0f53a01b65b24d6385ae25830f01afe4e02ed52a298f9517be8b359da45a6f2699c14
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20190609-r1.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20190609-r1.ebuild
deleted file mode 100644
index 9a268614e7a5..000000000000
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sxid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sxid"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-syncthing/Manifest b/sec-policy/selinux-syncthing/Manifest
index 1c375f89f42d..505d40c75667 100644
--- a/sec-policy/selinux-syncthing/Manifest
+++ b/sec-policy/selinux-syncthing/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-syncthing-2.20190609-r1.ebuild 285 BLAKE2B 334255c6b081e0a00ca143276d5458dbbfac617cfbbc586d38ef46ee61169bbe873b18c8bc2575a60970fc5f2a0a2c8614403b2c82fcf8a3e5aa4f2def185676 SHA512 4e4e77d1515b6f2c283482ad4f93881b78017e40a143f9b8be36e8be4caa7faa7a80c9434c70d0fb87496ce5c41e94444d282603b8219566caf602f4941d7e46
 EBUILD selinux-syncthing-2.20200818-r2.ebuild 285 BLAKE2B 4dffb0e40ef042bea4f236be5fc87c3ec871d9d3d3e444f60315140fec314b6963adb8775a24716d7571675235851b0e9f4175c5953f2cdd34d9610a0c0a3bc6 SHA512 b8f511627b9b78a55c5a4cef8677c2a428844baea76690ef46d933f9d59e4e89befd8d78b0ca7f82f8762e5ca7e0a8493860e111e811475d9e9ce8149f6fb9a7
 EBUILD selinux-syncthing-9999.ebuild 287 BLAKE2B db01c93176aca739bfcc7bf2a740191cdf42d2e38e73e621aae4e020f6a2535fc1aa94c1208c88d094330994bec3a7a26025cd1619680765d098ceb013fecc34 SHA512 8f6e7a6b129347bfa355e5a719bcbac23aed0b1d9325aff20abffc084751a180033b67c0993715955ca835df1230058485337d0cc7b0ebe5b7c17f25eee9b039
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20190609-r1.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20190609-r1.ebuild
deleted file mode 100644
index 7ab1c868aaf4..000000000000
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="syncthing"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for syncthing"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sysstat/Manifest b/sec-policy/selinux-sysstat/Manifest
index 6553b5e26f7c..76e798129102 100644
--- a/sec-policy/selinux-sysstat/Manifest
+++ b/sec-policy/selinux-sysstat/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-sysstat-2.20190609-r1.ebuild 281 BLAKE2B a29ff809198c6e5eda129fa9b0a7faafcc77e165b116f1249bfd5fabc47c6e5f81adf06fc20ecbc646757fe29ec8eba2a4b232689169b79ae54db482bb11e201 SHA512 944f82805f5892f3b1e683a35c8c868d48366e89be517cad423dc4d539478350fb2eb7caa5fda1ccdb04a9a57db6e5a395eb8a941c3cd0d842b0d1170d4e1c3f
 EBUILD selinux-sysstat-2.20200818-r2.ebuild 281 BLAKE2B 8e3571a1a91ef3e41888e6f325bbe328aa839fafae5ef7eb0e7332890335b17bb9d79f2e4fc4e237c2d079313dbea49e46fa0459d248c5d78a3fb089766b476d SHA512 7fac0536409183722359158c81152cbb5d946b841a92da88dd85b3e7bfe4ed7415055b113bbdff7d4c16951189c6658eb9e724ae03405041b8ef53d39aae571e
 EBUILD selinux-sysstat-9999.ebuild 283 BLAKE2B 334a1be93aef8c408b973a2fc04add142f3377d64f8ba1ab0c9dcc4663ffe79effb828bf7b459a66a6853311503a09dec36c53d1fc7c0efac66ced7d74dc1e3f SHA512 f1596d9f6e96c4cbad383d5dcf7073c972abdbc09b3559088eaf834dff4ab29d9efc24be6ba648e2d35cbc8beba49743c792f5d8d9dd0cc3159602e98405fe38
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20190609-r1.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20190609-r1.ebuild
deleted file mode 100644
index a13125cf8b01..000000000000
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sysstat"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sysstat"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tboot/Manifest b/sec-policy/selinux-tboot/Manifest
index 463aa021a475..78ebb4b98ef8 100644
--- a/sec-policy/selinux-tboot/Manifest
+++ b/sec-policy/selinux-tboot/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-tboot-2.20190609-r1.ebuild 277 BLAKE2B 8d930c9ef0ce03bc878e4e12956a420870fa9831aa6401b2d2e27d3a849e75c9a26d95207b7860adb28346ea4f7ac9e38da9a8f86e71616acddca5aac9ad30fb SHA512 e661fba84f8965319720a19d668c81b5d6b0b3a6caf6e69056e9b98a626c07e6cf37c76401dac0fa58b63a64a46c6f0517ec4ab0f8ce0a52b6826e0d8db8545a
 EBUILD selinux-tboot-2.20200818-r2.ebuild 277 BLAKE2B 596de9c3e5971c320ce0e69e5cc624a99e96b677d8bccb2a8bb25440f357b1a563292fe60162c315cd42364905163e634d7f4cfc0b3028c91e78074f73eb36cd SHA512 19fde3a056f8f88351da1a04af305b71ba9b00526615ee6f9fdb50938a3a9b0853aec32c0bdeca5ecd7667b1445d33aacc6cfe3409d9d38e2d92eec35c3d7ae6
 EBUILD selinux-tboot-9999.ebuild 279 BLAKE2B 43f9ca7fbc3cb03e810dd20a080a25b038df12bac3c65ee3667d960621264ae53af77726f2abeb76e579a96254a0b5f40e2596a7d6444e0827364dd9f1c67f89 SHA512 f97f89e3e442acafaba3ee1de23cbfe513c4b8a8955a8260d07b3294e3ce5021b50b071b79869d8bb3c8ca14f5a24ef6df0e575314b6d4ea46a972e579f3dcdd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20190609-r1.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20190609-r1.ebuild
deleted file mode 100644
index 775911f750de..000000000000
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tboot"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tboot"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tcpd/Manifest b/sec-policy/selinux-tcpd/Manifest
index 3fb32cd2fe7c..425b27affbd4 100644
--- a/sec-policy/selinux-tcpd/Manifest
+++ b/sec-policy/selinux-tcpd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-tcpd-2.20190609-r1.ebuild 369 BLAKE2B aa2e7b1295709250a9ec4d3410b57c196114779c003752eaaff276507fefe7149f732bfc911918ff5415cead5e5da52c22c64b7f2d064c76d5c8d7db6ec545e1 SHA512 3bc6615fbf7d0e364dd00af18a1d9262967383917dee55f334aca02096705e7d9726ad00cc162664883cd78b48dcf3111efef25ebf0d045977895582e468aeda
 EBUILD selinux-tcpd-2.20200818-r2.ebuild 369 BLAKE2B 3b6fa706268892351f17064e8daffff7b62994a1e3e86d2b9f33fb98d3d39b9c64c9fb2c381b9e3f71aea374714cee559d1fcbbde53d19777f0550f4149f81a1 SHA512 ed543952b02c10c52f4c41ad753494ac2db648488ef356e9587c6c9ab24ed76952c6a4212aaea2f7de779564a0c04a7fee2041d2a57cbb310347f22cb7d96ef7
 EBUILD selinux-tcpd-9999.ebuild 371 BLAKE2B b65d6cbbeb83b8d9cbbc48b6015f86f52147c88dab0cfde802c75a0a3d29565195ceee60553982ccbd2c3d2fe9c9a21457641e9d304886299b5bfee09e3b5d05 SHA512 44d598dc69a091c1a86d14308c8b178db878e84e79b933ecfff3b3b312c5f444a9ab1bb7228329cc57d6c417f28e5af08dbae3f3d8f55a47a54f48738fb761e8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20190609-r1.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20190609-r1.ebuild
deleted file mode 100644
index 2e55abea5766..000000000000
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tcpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-tcsd/Manifest b/sec-policy/selinux-tcsd/Manifest
index af44113e9d67..bc3c74104b16 100644
--- a/sec-policy/selinux-tcsd/Manifest
+++ b/sec-policy/selinux-tcsd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-tcsd-2.20190609-r1.ebuild 275 BLAKE2B 0c158d22f23d0fd438d9bb758ac6d5fcd4d624ca08325428c76ba19c81a3c28903b25830c60d3672d2db5d376a3946eeaeffbc2e0e810e820dd4bbb0f0b83697 SHA512 66338412af5f0237503fb35762b419e00b0b874dfab6b38dbb4e40873c5c22901decae2f5b57cffe924e53c249087bfa2a07c213efbcd5ce75edcb4298551ebb
 EBUILD selinux-tcsd-2.20200818-r2.ebuild 275 BLAKE2B 8c2c8e7d67ff1c7c43930ceffde3eee667f6de4eb9f996b86cc2ff0fb668853f3ded1ae1d6eb6eff58cec1183b056d6c4c3851f1ad507c826e4e8babbdbe8baf SHA512 ab03d45cc2b31e4230229c6477c5f34a230cb9345d23ced18515d77013d752f9f7490e0850a43c32d88cc7cbfd24ed34262687728573369ed317d615a4122aad
 EBUILD selinux-tcsd-9999.ebuild 277 BLAKE2B 1e6decfab12278bbda8e7c73ef82059cf28e2e188f45a4384c5be9d3a2d53c4e4ee75d6ea58c1fd9795e41a8130cbb743c60793647052e159428bb8f0336ff85 SHA512 0d3afe42b4226b1fe8c6bb10a27650726a2950b096d0f5fa22fb2cffa6b13b52f7746b1746669d3be6f02b8761b5d09f52af50df1d74796b827ddef95458a87d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20190609-r1.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20190609-r1.ebuild
deleted file mode 100644
index f373db8f23fa..000000000000
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tcsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-telnet/Manifest b/sec-policy/selinux-telnet/Manifest
index abef4baffef1..07cb385cc0ca 100644
--- a/sec-policy/selinux-telnet/Manifest
+++ b/sec-policy/selinux-telnet/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-telnet-2.20190609-r1.ebuild 385 BLAKE2B d7d4910f1b547668f075766c610278866cea1a43597f990070ae3a2eececf3aa155296e873c081d2a3ed8d14926fb15ff3f3115ece2b20d16d6d60e01ad2406c SHA512 09651d9c80a5981b332a3f21e19521a8b4457f7e2cfc04b8a2c2b6d0e805d81f7b8b33cf5b5bc5cbdbd0beb4c29e06498c0f6176ff11ab4f30922d23d40542b9
 EBUILD selinux-telnet-2.20200818-r2.ebuild 385 BLAKE2B e5061d83ed4ffcc5b6db65ef1884b474edb39e14e747a805c5f630885592fab35cf807f69243a3c533b55e4fc34aed5e3f4c2c6498d0787df23143fd83ef1183 SHA512 a06347a357e29a92adc622a54f30be01dd37e96b46feef28127723b6748d60c864ecd43fd5e11704ef04b0dbdf46834a8723f2972854ebf1f4a3eb1ee5207dc5
 EBUILD selinux-telnet-9999.ebuild 387 BLAKE2B fe5f453f8d21d8a0c0037761c5e881b317e2cfb527073b6bbb12115200265a13462fcb2e02f9ba4612f2988d01fc9553fba8d72c8391ff13676dae79aa6e103a SHA512 7de8106232a33c0f3167584b66b38c90895f6d7665d999307aa564defef82acf827e0123a27a7183832c708d728768b706d18d11020b07b5a57d9be605c5b2db
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20190609-r1.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20190609-r1.ebuild
deleted file mode 100644
index dbcac40d0959..000000000000
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="telnet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for telnet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-remotelogin
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-remotelogin
-"
diff --git a/sec-policy/selinux-tftp/Manifest b/sec-policy/selinux-tftp/Manifest
index 09f304619eea..2b41c3c0806c 100644
--- a/sec-policy/selinux-tftp/Manifest
+++ b/sec-policy/selinux-tftp/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-tftp-2.20190609-r1.ebuild 275 BLAKE2B 9f7f227089af0f732a9a341fda002d3444dc2f9a23114644208275d0f93420746e3503caad7b3b088b4320d169f12303c12ed56a401849697b1873be734e870a SHA512 cac8161c439cd6789b7bba3db8ccb79cedcb26743dee228637384faae87fd5d910caf56d644385ac8cbb4ae4d6a6fefae1f7abf4b2eb660146be2de49198dd59
 EBUILD selinux-tftp-2.20200818-r2.ebuild 275 BLAKE2B 5217c2edf9be3a9fc0ec67645f9ff8b6cdab115832f80ad5f63986c0ff8d0e028f7b17382a39966d8e6387139c2b80c6b43a78ac32c48c874bc44a6ca68e7239 SHA512 e026e21d92738684e80d5dd8942d19561843aa48eaa03e05625039ca86a3cdc80df6abc8a1f347b63f7c2ce71632c04122519103ad0678597a4863b446693b5a
 EBUILD selinux-tftp-9999.ebuild 277 BLAKE2B e5b5a746e82fa412836b2f4a973a8e02e8775a8161d19c570da0e8caf41aa30c0fe2210783f26dad66f5a9a3234c3d0a7946971c6a2913e15f9f668ce19b2361 SHA512 9f56642de4d27e42f04513c788ae420155d6813acc0dada234f3c419cc3ac8e1a48aa0d113f7060b800fe0a46ebbda75253d7ba227a0c77ad06cc219e90c674c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20190609-r1.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20190609-r1.ebuild
deleted file mode 100644
index 979844036988..000000000000
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tftp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tftp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tgtd/Manifest b/sec-policy/selinux-tgtd/Manifest
index 592440fa2819..f5545882d222 100644
--- a/sec-policy/selinux-tgtd/Manifest
+++ b/sec-policy/selinux-tgtd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-tgtd-2.20190609-r1.ebuild 275 BLAKE2B 440b48c8d6a7ff6532d1d7436dca9d5de3a9f1e2e6641bc31b54e5dd74088dad4c9f1671eba952e82114a01af09fc02dd7d76766184ecfe9c4f82140ab0b8d9e SHA512 b5e30f711a2a7102ad0a27c68c76d15fb74f96062f4a200527fdd74fba0ff732737c34f4a3a11261965f1a894c616c829b6c8f2af2ff0a3a89549095efdde49c
 EBUILD selinux-tgtd-2.20200818-r2.ebuild 275 BLAKE2B e6108d7a7ded30378777b0677fc43ee0cd85a2328c3f02273e771731cf44ae1a41fdbb04d699afe3bcd9046d001765eed71519b16c2927f13ec6c7b15636f960 SHA512 e9f479a86089d12f2dc32eaf172a6961358df7ac7fb946169fbeb8011a4a6a5f7d0978b6b3e9bc7f4561b8c3806b782855049ac48d073e1ddfe1d40975b9bb38
 EBUILD selinux-tgtd-9999.ebuild 277 BLAKE2B 655cf9bd7e68722402a3a192fe2bee1d8553f069a117363db0a83097bb77838d22c4439010cfd2674499d8cbbcb2901995b2c02c4211c3ae63fec917cd541501 SHA512 655634558bf1dade15572046cfc226c897911c6f0325758890f1eb0038d8e92e5cdbc8a153174d9b0935fef6dd263205ea31102c1f6aab9165b0edaaa68b2a7f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20190609-r1.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20190609-r1.ebuild
deleted file mode 100644
index 57e01c6743b4..000000000000
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tgtd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tgtd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-thunderbird/Manifest b/sec-policy/selinux-thunderbird/Manifest
index e59680d5f4a0..886f1f999b22 100644
--- a/sec-policy/selinux-thunderbird/Manifest
+++ b/sec-policy/selinux-thunderbird/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-thunderbird-2.20190609-r1.ebuild 387 BLAKE2B d95651896a7848be99b7e8995d534717e17900cdb7b1ecd5a5a43f5815ce50680344d8bf87aaf0fcfdfb4d6e34f328d9c7d391472ad42acd4cfbf70f3cb1caeb SHA512 52cb0e22e8ec6bbe831becadf9fa0fca996b40e34b4e7d6c608e398a0f2ab0eae7608b203216c65bb693ccdf9d8ca103ceceb51f2c3848d6b0a84bd7d403ac52
 EBUILD selinux-thunderbird-2.20200818-r2.ebuild 387 BLAKE2B 37b4baa794dc51bd23e401f658762011133cc40d7d4879b10064390172996325d40e2b03c7ec1a74c00fa0570346837e706d2f4f5cf02aded95a46e1c9ebd0ea SHA512 accd99668546892416ad0f4ea5c250afc2fbf6776a0b1015437fbe778940a68e21c1a549db378357011fe33efb42afb062b903be56ee237fe45a7d654597c2a6
 EBUILD selinux-thunderbird-9999.ebuild 389 BLAKE2B 9df5c268e82b993068d083fe4598c26e4520e02a2bf122da09a7babc4999376f28f19e851708e5a4d912e10981a600c631e292d90fe3581461bdd6ec4135c050 SHA512 b55c8bf2334a61c0a64a2bf17b0d293bf624547d7b808e5300e85dff704a63e15ba45166a0b62fc262601f1ba6033ddf175059481b4a411c5055aae86067e431
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20190609-r1.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20190609-r1.ebuild
deleted file mode 100644
index c14772e51c48..000000000000
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="thunderbird"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for thunderbird"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-timidity/Manifest b/sec-policy/selinux-timidity/Manifest
index 8fe5f7331a9e..fabbe7800248 100644
--- a/sec-policy/selinux-timidity/Manifest
+++ b/sec-policy/selinux-timidity/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-timidity-2.20190609-r1.ebuild 283 BLAKE2B 2d9649f5543cac5a900a4a1e4191bc1c05f22118a97e52192791cad747162ca50d0682f687240109ec6ea0787e14990aa563e33294116a678677aba71a7d2b38 SHA512 17f798f3d4504fa7b89a6e950c2d60edde74ae74227c9cccc3a2e0ddde43818c98b69794c8ca8f4475822080a0b858e30e9f478125d446b07f32e440c49a8973
 EBUILD selinux-timidity-2.20200818-r2.ebuild 283 BLAKE2B b0632c96a5008ca4f85b9734b3b26c02ee793a13ecb2d1ac9d3d5cc536644e893d29740df6d1e29cd321690cc6f4ef692abb635406621ca6042f357914d0661f SHA512 a42b6acf77635ad86ed61c9ff821eee2cb5f8771b1178a2e40606be09a19e9d16827a93da74c71a230ee8f4e07767f7be4108c1b3e5724c0ab9fea7cc58fb05b
 EBUILD selinux-timidity-9999.ebuild 285 BLAKE2B 9af670c3d4c17c5f431875e14ed97905ea6a04279a17ebfe8ae86d92ff046ce345c4fb9439f22bf4280e8360560d8b9c20b1072ab66080f96e2c31187567f83d SHA512 c7a4e3af18cdea160705b7d8f63565cc5118af374424d138223685b89dab13a6817bfb991b733bcf3f78bca5559a51d8610b29daa65b6d29739226c706a247d8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20190609-r1.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20190609-r1.ebuild
deleted file mode 100644
index bb061deee85e..000000000000
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="timidity"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for timidity"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tmpreaper/Manifest b/sec-policy/selinux-tmpreaper/Manifest
index 1fa5a60d6741..9dfe893f5553 100644
--- a/sec-policy/selinux-tmpreaper/Manifest
+++ b/sec-policy/selinux-tmpreaper/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-tmpreaper-2.20190609-r1.ebuild 285 BLAKE2B b998e327d8e1f53f3fbce83c5ba041de9ab5f1cbcdde61a98d443cc1e6a21fe543091383d0c1dfd724119aa23c5e3a55e726a774ced10c2d9a64b7d26857dec8 SHA512 53b9bd46e7619c6988c3001ba03c098cd487b49cbbbf3df1d022fc0a48c88da5f6f33f5095b1f0cb6c80ef96e0145ef94e59983701b0d949e8e2623905540aff
 EBUILD selinux-tmpreaper-2.20200818-r2.ebuild 285 BLAKE2B 8feea21f5a5b89dea886263ac59dab3b577d5e66bf6c6aeb7eed8123caab7103d455dfbeca9f15fe9a8e1ff13a3a41ee52b030e395f6d08653b9e417752758dc SHA512 198cfa8468af3539bd7f21c9f16112d7c900018bff46bc345bc0757850104e4221e39d5ee14e90ccd29c3ca3a2690c97815f8174493ca43a9ffef3a2e850e2b7
 EBUILD selinux-tmpreaper-9999.ebuild 287 BLAKE2B 7739b39729eda6e56928f6f3f9f951fa87984373a57dcd0931e889c64600d44d5c377426372f48fb50e56f34c368d9f1f3a40d8dc37e0abdeee0887bd04d058c SHA512 8c0c10c2b9ce53f234e8af142eb1ad1617d7d37216310096c46bde4ddc146a8b4493745e6704a3ec7e903b0ba8d326e045c86a888dcd0323a8c80707be34157b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20190609-r1.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20190609-r1.ebuild
deleted file mode 100644
index e26c0cf53352..000000000000
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tmpreaper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tmpreaper"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tor/Manifest b/sec-policy/selinux-tor/Manifest
index 7e5805ad8887..175a76cf4383 100644
--- a/sec-policy/selinux-tor/Manifest
+++ b/sec-policy/selinux-tor/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-tor-2.20190609-r1.ebuild 273 BLAKE2B 131332cb3779fcc000b431017e3ea9837cd9eaeef10ea58656e9877cc6866f2d2fdc301539fd19899e874be010233034dca7f9a249916a8809003df62ae7396d SHA512 ccc73ed226782bee5e93a6825d8fb35c4e6f6fc890c82602937855bd68e65c25b37603168ff24b752d66c4aad5d4c358c7091ed2d684ebff4684e16a29edf16b
 EBUILD selinux-tor-2.20200818-r2.ebuild 273 BLAKE2B ef78d6d449fc26fc07b8ebb481d3271905e36dc22875ec3a7cc06c21788e58550c0f61e3c158ff97117af364f51124abe8dd2b7308011aba6ee328d67fb75a94 SHA512 236a705961db2008bc2e65b47cfb47fd4580c4a4d8fd5a054888f755f93c6b9e2a20b841add7dc435e861da1c8b35696ecfb81b14dd9e973f8f928dd51db7bc6
 EBUILD selinux-tor-9999.ebuild 275 BLAKE2B 67914d57b0be142eb2762a13ba2a9f5985a9656885a8c40e087530fd93aed81318e9f96f98b0e8636b1ed75ff0450133510d9c02771a6f0a30a631c5f298e454 SHA512 046c9f7fc6cf1459cdb0f8285c5bbb541d94b0a575021b7147e2b4f0452e3caf19c991d3fca360af035255214094fa2b43b0ccdcaf57518b698449e18e3150b0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20190609-r1.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20190609-r1.ebuild
deleted file mode 100644
index 1ed577178c60..000000000000
--- a/sec-policy/selinux-tor/selinux-tor-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tripwire/Manifest b/sec-policy/selinux-tripwire/Manifest
index 8a7facf548f7..39465bce79e4 100644
--- a/sec-policy/selinux-tripwire/Manifest
+++ b/sec-policy/selinux-tripwire/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-tripwire-2.20190609-r1.ebuild 283 BLAKE2B ccd98ca72969d8949fe63ae594dcb74d4290089e94e93d63222e88577e2327caf55937c8a612f96035d5dbfa2c4e901159600733a16b77e836ce9ac3607642c3 SHA512 704d837b2534be4397ce92c4bd1a776b17047f77e82daec9540c2bd422fdf7d9529e9a4c3a9fb487fe63d4a5807ec41a9b65bcf03621fbb2ac78ff8a123f3605
 EBUILD selinux-tripwire-2.20200818-r2.ebuild 283 BLAKE2B eba09247e9d331a7f26f45d8140d4e7e2afcbb85538d32b0dccd4dfdc09bca17ea150fbd4ba9e7b3e8a3c910817ec4367b3ab1581767f5c01518d343dce3f154 SHA512 eb7436c2650a0bf6fd49067ddf78394302ec53b4dda90a6dfd8469a1c6750fd4f9b24845d8ec6b3c903e298febf1e8bfeab38b76b34111a44d4a921114c4badd
 EBUILD selinux-tripwire-9999.ebuild 285 BLAKE2B bb140ece7d86a7d90dfd7c94cfb94c02babc2aea4d5d044370612204cc68d8cb3fcf44cf55eb62e4a6446e05d735adc2667c761c5bf429cad10f3171dad136a1 SHA512 a094e1894812dbe4d0a6c88c7182cb100876dd96cee27248a8bc1c79ab7878e3b8f083597b99f46f006bef37c541651778ae9771085585410e428d883e4866dc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20190609-r1.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20190609-r1.ebuild
deleted file mode 100644
index 87ec997968ea..000000000000
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tripwire"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tripwire"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ucspitcp/Manifest b/sec-policy/selinux-ucspitcp/Manifest
index 1ad84905c7fb..bf85ff77bb4c 100644
--- a/sec-policy/selinux-ucspitcp/Manifest
+++ b/sec-policy/selinux-ucspitcp/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-ucspitcp-2.20190609-r1.ebuild 283 BLAKE2B b0960d3ec1d5a7b67d77d7ac1712098c3e2c0459ac750ef057b8b59e9db6e8ae77b99a2f7856ceb7978dd44059a9bec0e422412626f4b0205a19c59e05651fc3 SHA512 d4ec638c9a11a9a11de642367e724ad4713f9bca3f5712f313bf9c411ccbcea02b0493f9620994b7b6138f5de36868fd27cddab6bfffd8b68edb5b3db5f21902
 EBUILD selinux-ucspitcp-2.20200818-r2.ebuild 283 BLAKE2B ecb8c41f262948901749509ee67fcae6b452d6f21bc5d725361b7d460617ae825ed9a28775645837b691672bb6f5655d73c74f860fa259df25d25259ca806700 SHA512 77a411ed40578a821608786ff18731821fd6b95468ed00606398645afd099c678b8bf2a48bc9b4084157f78cb34653c919ad37196375394299c6be9027da31d5
 EBUILD selinux-ucspitcp-9999.ebuild 285 BLAKE2B 1c6345b751700a03a844b75792e3a1d91e6945b1f8e2ea711e0504711590fc5be04909cae8f2531d685c66b8dd44231cfd67e9d0c6b893f4a5756dd215e2b1f0 SHA512 097543d1582c6a6665360f8a8896b1831e924bf5450556584940052e8076109ff3087da2b79ad18753d86d8be7fa4a5f5a8bf5cdeb52bb4a3087768d853ba43c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20190609-r1.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20190609-r1.ebuild
deleted file mode 100644
index dff5feca0456..000000000000
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ucspitcp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ucspitcp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ulogd/Manifest b/sec-policy/selinux-ulogd/Manifest
index 65d134076ddb..fc6aaa906034 100644
--- a/sec-policy/selinux-ulogd/Manifest
+++ b/sec-policy/selinux-ulogd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-ulogd-2.20190609-r1.ebuild 277 BLAKE2B 5dcc0cc39d07cfb1d7f2d2714c1c9d1ac0e2d1bf5f92b6bfce809e462bb66b63c1b0e08e48f5574155332d7ec89c283d18662db98f38372611cce328a2a65153 SHA512 412e79d26982788e11dc98c997c4122534482c40b724bec8fbb4a7f65d86d529fbace3ffe5cca2d21c5dfec9275a3157d10822daf64cecd060a9613f20eaeb89
 EBUILD selinux-ulogd-2.20200818-r2.ebuild 277 BLAKE2B 8c01ab80811240fb2d16e6201213ff4ee3bea9e5131ca6a0a2e599578c0b9643d0b6a7fb0a56ad552427d12416cc67a92f2c826730a323bd7ee02eef774c4be1 SHA512 f252f0a7d67403bb17fe1d5adf7e3b5af47f96f2417b8c57b45c51dd7914c3f0782a1a11eeaff61562a49286ac198a2c04f714538fd94a65de20ece4727ad6f3
 EBUILD selinux-ulogd-9999.ebuild 279 BLAKE2B 2d2ebcca0346bf06542e3d14c232d56532cb54c5c2e2bf2fc83d87f9143a2c397e98701edfd84a05c50e4c173a4fb427f7e1408b75355955685f76e928910514 SHA512 0384c67c611db33e31060d65a431012f9d8f54e98716411cf390215d60a33325f98b2e4604e3ed15fc73d952e5c4fc5530a5da8186b8acb072765534c29e86a3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20190609-r1.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20190609-r1.ebuild
deleted file mode 100644
index 04680ac1fd50..000000000000
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ulogd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ulogd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uml/Manifest b/sec-policy/selinux-uml/Manifest
index 65d59c7c55cf..34efb8c4cd40 100644
--- a/sec-policy/selinux-uml/Manifest
+++ b/sec-policy/selinux-uml/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-uml-2.20190609-r1.ebuild 273 BLAKE2B ebe2a8ead24ce2ed1ba44455ca40fba890871bea8fb0e5eba791e80f95e6f42f8f012ba472ccd4472c732374534fd7fd456b60b19240ef51a79fb2a1f271e3d2 SHA512 930e9367014677112f28c34c008c3a8474c23f46906ae2a21da1c737c79f587e06825e706fd0e38bba5c5a128c1db6037818e1087fcc073361634fa4061e9b2d
 EBUILD selinux-uml-2.20200818-r2.ebuild 273 BLAKE2B 824266ee7a2b4fab20d99c522c54dbe1748e8c6a1f51f2f4405aff13f87b9329414b215a0f3e85ea6269fdab181f26463efe34b94c533d18b689e37936ccf0f3 SHA512 348958ae75dddc6ae72f27ca48cdb31a547ed756e3955dbed8a5455c02ca7370b5c42c04f9146f57f96254364be3927168c761974127bd75267773c4e0b940e1
 EBUILD selinux-uml-9999.ebuild 275 BLAKE2B 691b2279fd8b637c3dca551ca408c5bf38526f9f88747f073d193aff634a14de83f7821876651e0fcf6ba7fb670a134c9376c3c57ce2b090831f68d03bea871e SHA512 c118bd851926a04e38c557420be446ade7845660a3c2ce5e25dc72df5aeab839e4cadcc92b74eedbfad2c8b86350b5c6edea00799dc8b825344dda97eeabe900
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20190609-r1.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20190609-r1.ebuild
deleted file mode 100644
index 584fdcd94e0e..000000000000
--- a/sec-policy/selinux-uml/selinux-uml-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uml"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uml"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-unconfined/Manifest b/sec-policy/selinux-unconfined/Manifest
index 001d04232681..553252d88675 100644
--- a/sec-policy/selinux-unconfined/Manifest
+++ b/sec-policy/selinux-unconfined/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-unconfined-2.20190609-r1.ebuild 287 BLAKE2B 34a7074f83d3a412bda88dd3a476ab1d100f5b5ce61b6ab03563f52cc2c488f68a734054c6186cfdb1904080d9e3ffb27c2a25e2a81e7f1ef3a9e10e7472dab5 SHA512 6bb924e88d93d801503a9e3ed7e233b03d6ddbcceda9b29f7114635e70b9d4b644ca2c0f70396f9390a8280911e8cbe68e65b69647a4aa42e88721ed53bf67c5
 EBUILD selinux-unconfined-2.20200818-r2.ebuild 287 BLAKE2B 238ae3eb41300b08d6366be4d103f57a0fffe53ce3625b1f470c31b8200d2b0fd6f36f3748ceb91cf2930965fe65bef1f50107f6bcbc3c507da2b8c3d1792839 SHA512 3871549d0d97bbb9efa77d0d0e4f7abf6ab8f30ae31d508adaf4945798734ba70b6218f2c1476e6dc1237ff4bb4d75b683b3db5b8d200ea328c3e48d8fdec7ea
 EBUILD selinux-unconfined-9999.ebuild 289 BLAKE2B a28c3eeb85e8039aa502d0af00048fb7dadd746c634ac2e547cbecc8581703a678015556fa5bfb21af94c19752d3b4bafb92348bec9650c59cc586142d9fa28f SHA512 533d95ade1cb1dc787b2a05acd498425736ed28811fb1c17d58440eb2932e7cde7de772e42bb0cfe97b24ca27b3fc6c6c7b57bed143a8b8a36b973d820202df0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20190609-r1.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20190609-r1.ebuild
deleted file mode 100644
index b5dfca8c9ae9..000000000000
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="unconfined"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for unconfined"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uptime/Manifest b/sec-policy/selinux-uptime/Manifest
index 1ae852897648..b78b16c120bf 100644
--- a/sec-policy/selinux-uptime/Manifest
+++ b/sec-policy/selinux-uptime/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-uptime-2.20190609-r1.ebuild 279 BLAKE2B 1bc1eb65bccb2bb7c80e535ab45d8b20e28df28684b5af62154df9eba51ba7c8cd34f55043b69a57313ea3cce6ad3214298026571e46566ef736f683e31760ab SHA512 b9c349eaf58f844cf66b65d43d83ad708af56a5ce78e0c47a9668a45f2fc54e86157e55ecc49e12f1f1f3b8da286e4b5519447879f0c75a3735a1dcd70088ca9
 EBUILD selinux-uptime-2.20200818-r2.ebuild 279 BLAKE2B 7ce9868901368afc47cfa71cd8c18fc609402c7268e2d27484f93ad88e8ed58a1b9bf78a81e582d28157f48e94f230feaa02e1515f138629e20307ee99c01205 SHA512 e86f3b16b8e45bef3e0d58b93d4c20fa8d71762ee9ca2e2fea8fe74b289d6c924c81ae90f1534524e273878bf3de3bc96cda28ae5fcc36401f76e51e18968741
 EBUILD selinux-uptime-9999.ebuild 281 BLAKE2B 47571fb1de4b963588aa191de430ead879c3cecdaeca6341d5d177f293a8fd5766c55ace7ced09e2bbe6cde01d764aee9749e1bdd738dbbde0b3ff3acc23a9f5 SHA512 e818af341996a8e28acb01fbda658ce9dcae80d378a1073cc5cf26a8e3ccc83ffaebff68f4ea4346ad457fded40ad787d0e2d132adfbb9f79771275a8be1b90c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20190609-r1.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20190609-r1.ebuild
deleted file mode 100644
index f379344cf536..000000000000
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uptime"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uptime"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-usbmuxd/Manifest b/sec-policy/selinux-usbmuxd/Manifest
index 417c3f0d860b..51db842c4cd7 100644
--- a/sec-policy/selinux-usbmuxd/Manifest
+++ b/sec-policy/selinux-usbmuxd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-usbmuxd-2.20190609-r1.ebuild 281 BLAKE2B 6897686f21679307acb4c462d5cdba0f351d36e49df077da305899d23bd7a23836727b8790382ffb38827b7f1484c319dbd78405f8a5f88d9bc9f2096d669a27 SHA512 c04817dc00d9d8eecf119eef3cc67bbc29bf9243d7eec1ad4850ff24d2e8a7766588496c3ca39d6c3b85348594d20216f132c9705663be40b40182c62030ab49
 EBUILD selinux-usbmuxd-2.20200818-r2.ebuild 281 BLAKE2B e04fafb854750d9aa5116095c8fed26f1e6fd0f70bbf6a434cbf1104e75f6389ba088b1ccd3a8d17bc995853b01d7c6eccc5f9ef73877ffa0db1ccca1983a52a SHA512 5030225a8c978ae168d6fdead0b8eba2125184e0d2179a5bf1b07a11e7782efd0aff659e1dba310739530b47cd259bf360c07619038bf04f1e5ae10c38817aa4
 EBUILD selinux-usbmuxd-9999.ebuild 283 BLAKE2B 4fbc5de36ea89106c35f13ce9a050f5a279d3ed93b230d9f2245cd05ef46bb01bff1c24d1304ca77d8f6e26522af6c57c2cb104668227a8aa409745f938d646b SHA512 9d5d6dfa7408340eeb1759bbb2ec0404dfaecacaedd2795ae75ec1192415e6c93ecaad5565ab2adf16bd5884bf0e2635af57a6f61a7a7ec7968c77bee47931ae
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20190609-r1.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20190609-r1.ebuild
deleted file mode 100644
index 82fa0322f998..000000000000
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="usbmuxd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for usbmuxd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uucp/Manifest b/sec-policy/selinux-uucp/Manifest
index 6c188ccfcd1f..ee5a6ab8a9d5 100644
--- a/sec-policy/selinux-uucp/Manifest
+++ b/sec-policy/selinux-uucp/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-uucp-2.20190609-r1.ebuild 369 BLAKE2B 310aa51886741611f95bd6d3229f46f188a9f9b57e7c7f2599c666a7df098b292eb4c6deb21f4e478f52b7a5efabe8d8cfaaf812eff8dd62d8d8f8b96744eb97 SHA512 a2eff3d95877db3563fde7d878c8dc9083fb66afcdfc0836ce82a8895bed629f9c84aec89cc92db3614241fc30b68a4d5832ce2b6261bbede7f0a5c1bfef0ba4
 EBUILD selinux-uucp-2.20200818-r2.ebuild 369 BLAKE2B 0931004d80e27e6fb6e4b3b1cd04d9e05b2a9caef2c93a15d03abd271a4a99d1e3040402012c5909a504f4b8233c3eeb46dcb96484a6aea6d8d8e54845db3dd0 SHA512 631b9ef1fb76c02407952732e9d4f04ef0fc5b4605207ff3cd862b9f47a591456a430269261af98459a5590ab2dac207e3535dd6365598b5430fb2e52f3ddb8a
 EBUILD selinux-uucp-9999.ebuild 371 BLAKE2B 8edc715b2d5807839e55d2554c38a61ea3a104b1fe2b96ab9fd1bd672ff6efbc8914b6007cb4e5d08e2ce04d252632ff0204d9c478a1a49d828c422308cb8b24 SHA512 91e8545ed6392fb3ba5340a5c7a791cbe1c408374538e6e598984caaa6b116bcd272044094c4a9730875a3daa8a6f8673d8c6281025855c4db612feb1e1caf52
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20190609-r1.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20190609-r1.ebuild
deleted file mode 100644
index 1cc80be15c6f..000000000000
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uucp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uucp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-uwimap/Manifest b/sec-policy/selinux-uwimap/Manifest
index b163e62f82eb..cf976fd2dcd4 100644
--- a/sec-policy/selinux-uwimap/Manifest
+++ b/sec-policy/selinux-uwimap/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-uwimap-2.20190609-r1.ebuild 279 BLAKE2B beea953b0dac410ffa7f3ca7e417c1329c91cb37a88b49e4e1ecb6330e6a126e26e6ce2db83bb69c0a10a7b4f02842f6d1d17860481dcf4b5dddb3493099c2e9 SHA512 a0537e4e9cc4a10803b48b13d218bad3d21dc97c5a0639a8953a7df4521ea3cb342e9cf43b01a94a165384481ba37d2d5966e055b17af425b4d970d7e956a07c
 EBUILD selinux-uwimap-2.20200818-r2.ebuild 279 BLAKE2B d0a6b6b1890b9f9d5192505feef7b3d18e77edafa8de1264bee0cb223f0b68ea06e233910ec4a24eabeefb6a8a05864be29e7bb75573525f9558cd9f32ec8280 SHA512 69d4682e4ef6bb7a045b3aa2a83fe18f4e781dfadc60545c6576a7df56977b8195b300651f812c2248d0796316c509ba614aeeaf187c67a58f9a06ea19b36280
 EBUILD selinux-uwimap-9999.ebuild 281 BLAKE2B fc2e7c5ddef1d75a2b680c18d105c17ae62ff94455b8d95ce063d049f200360b4bc922e428ec2a6d3087c4e98e9af9ee71ae5256b419a93e7a6239fea791403b SHA512 30240bf6943685f0d12e800986bf74cc6f80bcea2f45fd69afb27dd6138bfdf879452a2fc6c66aad6f6307e825d50374f80f07fb604b3e2f8630028b77f8dbc9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20190609-r1.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20190609-r1.ebuild
deleted file mode 100644
index d25d09577eac..000000000000
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uwimap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uwimap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uwsgi/Manifest b/sec-policy/selinux-uwsgi/Manifest
index 71cef1343d2e..289a7093a0a3 100644
--- a/sec-policy/selinux-uwsgi/Manifest
+++ b/sec-policy/selinux-uwsgi/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-uwsgi-2.20190609-r1.ebuild 277 BLAKE2B 90acecc49ed9692e90db1752b8ee9ad28f34f3ad0c6a486b769cb7a56da165cf7b80100c19e603a99edf7b0154b21c1dbbbbe2bb12c74f018511f42c93ce904d SHA512 d3469826786157ba3942859c9e33abb345ef4ec13eaa39111b6af1450a87bc508ada367bebfffc40b2ef8237371410eb2a7309e59b43525ede15c4eb9122cb55
 EBUILD selinux-uwsgi-2.20200818-r2.ebuild 277 BLAKE2B 202b501e7a062b6a5a246df0c88ad7cc096c74c5cb470ab2503e0609170f1a1605bf54d8909d5159739d25de83c0d28e835996d97acf6bd347f6d68bc8cc88fd SHA512 62c4f73cf708c5f71e4487227f2e2750d0825543d91de12f4f95e254dac645c55579c1fa80adb54b5141a426340c862c8ae79dff5e1d4cce346be14943f76477
 EBUILD selinux-uwsgi-9999.ebuild 279 BLAKE2B 9d648f0f6887098899652678cc219eb59115221c263538700afe3819ddf16957579ab5b8d269871248c3809da31f46edb48ab27e9e18ca8cd2e61582c18c4e17 SHA512 c8ab34f259475c0b8f5dd44044374e4805b6f56c656a0accc1010ea6cc53358569ea9bb29700f7b3d97ea90e71fbeedb0b3b9a243275f158865abf5f646870eb
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20190609-r1.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20190609-r1.ebuild
deleted file mode 100644
index f0a8fc63e2c6..000000000000
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uwsgi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uWSGI"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-varnishd/Manifest b/sec-policy/selinux-varnishd/Manifest
index c7665be46b97..8cc6aa719cbe 100644
--- a/sec-policy/selinux-varnishd/Manifest
+++ b/sec-policy/selinux-varnishd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-varnishd-2.20190609-r1.ebuild 283 BLAKE2B b1df558436b2c54129b2acdd14e7a38975a220b1fa2c1d3605f2c5c99b4d7cb23682d77fba126b2aa7524581c8fc84e91d942f8d133836fd8a6ea0c007eb69e4 SHA512 e8de582734b979089238168e6f2074cc6aa900887b1ef19fee80a79cdfb3bd8bfb51e83ea341a60456bd5055cd363bc54c76bf188e312e2a8f6527dff1b07dd8
 EBUILD selinux-varnishd-2.20200818-r2.ebuild 283 BLAKE2B 07fd66644b63cd687ea25d5249192e2788a28e9f4d3d0f6c71c007a5f4ef440f4ec90a61163efb8d9cf81e9e702c43471d693f0c8a8d6ccdd7134488b4c869f5 SHA512 2716b8989b84ec4ec887ee9ded9f4fac02f1f8a398e7869773e7abe7449f6a7945bca92876341051a7a99daaa592cdc0cc9d0e2f849f283fb98eff19276a2590
 EBUILD selinux-varnishd-9999.ebuild 285 BLAKE2B 76972231bfa4142d6a9e7fad413381f3f7b147e4c447985f1da0e4affbe07054f108218213e5d1875d7e34dfe16a41bf4cc3dec7b079c0dc2fd5bf4714fa98cf SHA512 dea2033ab06f030026a1f46db50294b0fef32f80d7ba5172ae1e17741ee1304faab3bc71afe9a6e288d3cb80f00dcc1689c1df2d78b783f66df748358f13009f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20190609-r1.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20190609-r1.ebuild
deleted file mode 100644
index 37c127035c87..000000000000
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="varnishd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for varnishd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vbetool/Manifest b/sec-policy/selinux-vbetool/Manifest
index dab46b0cc7a7..0bd35ee0898c 100644
--- a/sec-policy/selinux-vbetool/Manifest
+++ b/sec-policy/selinux-vbetool/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-vbetool-2.20190609-r1.ebuild 281 BLAKE2B 47fb7322916c27362ee37a1721bfc5e2d6fcd479fb10f57fbd473773585b6e2a96d07bc5ba263dbcb20c7adaaa53339927d76f3117682cee679e6e0eb81896da SHA512 cd305370e1c08b49c1993036d2f6aa3e157313768c2bc5f411976acd358c44fe8972d8d72f4d6d71cedb4f362ccfec088b46e9a78fdf3f0c77dcf9a2d579fe09
 EBUILD selinux-vbetool-2.20200818-r2.ebuild 281 BLAKE2B 587c4392d2501d3af7fc149cd01621ff1211210910995383d2ea1e8f48e6aaad7880b50bd2c7fc0d36bfc709b23cb3e009992bab7526d463a2062adaed9176a0 SHA512 2e7b087cbd37e797c87bf4977195b9f748e2087d6819b50307543973f47b2e9322f2392292706b14b3306f91a955c301c519eb9586f6f10b8b2919eabba2b854
 EBUILD selinux-vbetool-9999.ebuild 283 BLAKE2B 8f61a03cc43069d90020b3726a79d711edb16331b6409daad3d8d5c41a0e72f78859ed5d10b4ba0b51c786f3e3c990486704c9a74b95c9249c3ee49d1be2e384 SHA512 6cff43f8fefb25f608cfa39ce2198f74236a682c40314b9bcdef3006adcae43df8cf37daabd3f15637aed45800f0c25eaece083e331b253d8ef3318f3d6916b1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20190609-r1.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20190609-r1.ebuild
deleted file mode 100644
index 74dc36ca5928..000000000000
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vbetool"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vbetool"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vdagent/Manifest b/sec-policy/selinux-vdagent/Manifest
index 07e988c52620..8b818d7f1073 100644
--- a/sec-policy/selinux-vdagent/Manifest
+++ b/sec-policy/selinux-vdagent/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-vdagent-2.20190609-r1.ebuild 281 BLAKE2B 85fb068beebf8e50793b64a9b1495f1a03723854c96acc8f2383e3f2a8d11e0dbb68ef1bc894040792b35344014ca3b92fffd1fda7b9340e4e38c5b854666775 SHA512 9003ded8d440c503f291891167964874d769fc35d690f3a98892db320612fe3756b0ca8056df8ba5a96e2c677fd5ad5ce394b1133034f9743be45f1712b8a7c2
 EBUILD selinux-vdagent-2.20200818-r2.ebuild 281 BLAKE2B 1c3fdcce7c8b6cc15ecbe6ce97492084e71e0d583fe8ed47184752246c094a2a94b027d8fb479dffdec0b079ae56f50d7ab04f2f55ebabd36c3f1916e198c8ed SHA512 b61bb755391c9e037d896d61f60695a1470084e0f9a1096a7f782042c14c58d928e1ab8f928defc8b96ced96ca9ee81e77dc80fe0c74d2df7bac5f21b538e9e3
 EBUILD selinux-vdagent-9999.ebuild 283 BLAKE2B 8cd24d8468ff04a37d586d65255782fe7538e9e574b8564ea48ca93ccbef9cf4f7cc3da35137ec8b3ecb70c5a8113eac78ca3c14a15dd44325a2ad5efa4d5169 SHA512 7ae36d411b7a94e2b65702f81897788bc2350314a804b31542a75e19ae72557d3e29eba8650fe15abc68a5ce307973831435190ee264e81301d7918ef9133b06
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20190609-r1.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20190609-r1.ebuild
deleted file mode 100644
index e20f8b4bb5f7..000000000000
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vdagent"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vdagent"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vde/Manifest b/sec-policy/selinux-vde/Manifest
index b3521010fe40..3b34d45a6c91 100644
--- a/sec-policy/selinux-vde/Manifest
+++ b/sec-policy/selinux-vde/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-vde-2.20190609-r1.ebuild 273 BLAKE2B 30c4eb1f029a7d5e3636ca938f9e8b0f8b17060f12861f8244f267592b755c4b176b925c175012f4436aefb85338dc4975ae13e2f42f28243f6bb17609ab2bbe SHA512 b7a1f4fc18eeeb055980b52302a267bddfd71792bec58d140fbf42a7dbc8c2eaa9f2fafbeb1a46769bf754c93ebc7be9c7bbe69cb38b891436551804d904549e
 EBUILD selinux-vde-2.20200818-r2.ebuild 273 BLAKE2B c470ad915c20d4fb978c4774d9371e5f02f1acbf07a60fad7d3ac9cd5ccf0586cff8125cc1a54fa8bf28c7fb09d6f1a22c312666810555f430016c04debfaf5d SHA512 b9bf878e1c0606a1570fef0200d7b15dc8dee9a11e75342d38cc774260fdab0c431fb2700eca7ba80d27fa96ab682cefc69e04bd51e337235797aed8c848884f
 EBUILD selinux-vde-9999.ebuild 275 BLAKE2B 4238887c4d91869eeb4c09824ada0c8d4a037781c240d3a8308f439c736628312a5e80d3fc040012c45cc812be667d6a6f845a5228de6190399bd5fa8263d6d0 SHA512 396b1ad89abc8f4ab5014059acb59022d227973045070ed3753aba9677e2116405c16529fdf96ef5d01afb916108aa6819440ad69c91091b419d894d1f0f96b7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20190609-r1.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20190609-r1.ebuild
deleted file mode 100644
index 1b2c0e80467e..000000000000
--- a/sec-policy/selinux-vde/selinux-vde-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vde"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vde"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-virt/Manifest b/sec-policy/selinux-virt/Manifest
index b4f754f52c89..1103ba724436 100644
--- a/sec-policy/selinux-virt/Manifest
+++ b/sec-policy/selinux-virt/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-virt-2.20190609-r1.ebuild 275 BLAKE2B 55562e3594028f93fe64638d9f0f4b7f51c57e1a241adfe1c5a4a5127285eb619daeeb96767b591fca26d04cccb53b2781619e124a6f3af0decc88e85bfc93f5 SHA512 b95550cd39d85273495f0562947c0f54fc82b7940f83e9333c2e083827856f705128914650735faf633882b94233191ac580447da4f4b36eb4665e9b009fbf5d
 EBUILD selinux-virt-2.20200818-r2.ebuild 275 BLAKE2B 63f8c748f7db912e57096b7e022d3cbf928c3397f985f02a0cd084b6aad7a59ba5b5517251ecfff91ab7c3f30cf77e4fb84c7acaa829c4e3a316d0bd6277c13b SHA512 27ee9b5abee83b681386100715a8b8e49d5cb67fb3ca8b6d05165a3984fbf238d0e38454907b662d80712ca5cab1505f1be2c72d908402c257123b303b7b02fe
 EBUILD selinux-virt-9999.ebuild 277 BLAKE2B b4a4ae0aad1d9f60faa9d46f689315be1ee453d9352681b075070c6791b44f71c8e384a79063717dfe2da4e236cf1e65ba53c1562c1bec54c70f7932df8c233f SHA512 532cda7d8115e129246ce6888dd70fe66dae7ae9276c8d9cdba1e4144a1b24685cc14e2b04b0bb1a7dfc0db30ead1d1564f303eea2e905a11aa722df10ac787e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20190609-r1.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20190609-r1.ebuild
deleted file mode 100644
index 44711e5d751a..000000000000
--- a/sec-policy/selinux-virt/selinux-virt-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="virt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for virt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vlock/Manifest b/sec-policy/selinux-vlock/Manifest
index d6afa71b901a..ae46ccebf207 100644
--- a/sec-policy/selinux-vlock/Manifest
+++ b/sec-policy/selinux-vlock/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-vlock-2.20190609-r1.ebuild 277 BLAKE2B 68e108c0e46a9751a5ae19b8d03bd0768c3cdf043922fb4b9fcb1ec492c857f9f090c734ea92c42aa8904766f8a296a7de9a75b535acc52ade76910cdd70c0f6 SHA512 ef2c3a1e30bbf14617a08aaa50260ed3f1d280abd3a42edc45151b8f456f17c6fae1fdf41acfe45ea2d723720db1b36ee6c8c1b0d59f067d1f5ba67dc7abce01
 EBUILD selinux-vlock-2.20200818-r2.ebuild 277 BLAKE2B 5736c0e43a02fba02b87f3fd0ca38d81e1c362cb2e3b1d532887247521b701110856da9c40bd31af1156b6de68d45d113ed8a7a56abe2a95fd7086214ae8959d SHA512 53220c9c41be7ff908dcbb19a4b265e8650dc7bb12ea6b1440eba8d6240684beca1b3fee32bfd6e9e75d5aae2355e26da41a67acfca4886d28d7a0a6e265e3ee
 EBUILD selinux-vlock-9999.ebuild 279 BLAKE2B d4bab26a19e3ccdbab2831e8d952566425bc0a329c9219ce95b865998a22b5de14b2b397e06532ec6976b96b7c2f3970968c85d216c17ed8f3ad5ebba4287b14 SHA512 e1e662a3acbbaeed2a727bb4fc0207278a007150d5ea83d22f5a99336577334b9624869b293c894e2fe23d7e28d95a0c23557090ee7d1e59387c6f73f0da8968
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20190609-r1.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20190609-r1.ebuild
deleted file mode 100644
index 9a10aa663c40..000000000000
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vlock"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vlock"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vmware/Manifest b/sec-policy/selinux-vmware/Manifest
index ffdf05907021..fc8a04e4fa2e 100644
--- a/sec-policy/selinux-vmware/Manifest
+++ b/sec-policy/selinux-vmware/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-vmware-2.20190609-r1.ebuild 377 BLAKE2B 7e2f7ae3e796337f0c4f8869babc09e1d5a37e6987f57bea921b89a9527ac035eed575a6114e6be877f20b8f4748c7e9e30d33c5c4d7e2eda68ee36225ecc85b SHA512 da87cef25654143dedb6842507333600fcc1a5511b0871f9874ce37c07ea78b74d6367a81f69c5b0fe587702df5ae6f760bfc7324ddd4a21fb0d81feabac1d7b
 EBUILD selinux-vmware-2.20200818-r2.ebuild 377 BLAKE2B a1bf5638b2e08fc5133aca5c44ce107c29a79100c13a61664c9774323601bcce686f677d56d5dc999630fc8328448dc0c32a085f98707b09e295c6110acdc027 SHA512 850a2dc55b0bb5458c3475951d056cac5611aa92999396810b8b2d8644c9f76136a12fad4d315894f849dadb384460483fd6d749131ed50026335644c3521f02
 EBUILD selinux-vmware-9999.ebuild 379 BLAKE2B 13d294e6cd501f05e59ce51309d6b95d2b7c5df7f0ea329f2a23739e9389bc2ab6ec37c0c0b47d83285a02f190337ebfc7321d4d777d9c14e191f9a05fca604a SHA512 59234a17bb4b8974a25ab9213c2c0e747a2ca9ecfa704a316237e4e61638fcdbf467447559d97ac8a32dbbd0709d135a0573c3ef03a8cd32d642fa567882734b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20190609-r1.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20190609-r1.ebuild
deleted file mode 100644
index 9d6a7e941334..000000000000
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vmware"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vmware"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-vnstatd/Manifest b/sec-policy/selinux-vnstatd/Manifest
index 080429654f8e..21abcb6a6362 100644
--- a/sec-policy/selinux-vnstatd/Manifest
+++ b/sec-policy/selinux-vnstatd/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-vnstatd-2.20190609-r1.ebuild 281 BLAKE2B 27d9cf45e247792a8bb5447b8e7721a67c964b742e5c088166649e187407d80e139726efca62780e5b079187b411fa74a9c551cf1a907dd063824c6af6d9e3f9 SHA512 0cf2c85b7c6a0580a7cfdb58a76a459e4d2cc2c922a18bba56666f0b32444963704d0124e5f9bd90c2ee5f13099ed071a47218626e851a987791a3cfdd830633
 EBUILD selinux-vnstatd-2.20200818-r2.ebuild 281 BLAKE2B 301a1dd9ccfd5dba1b425a1e9024ddf2d129992b4d5c98e4e260d9871efcc6ce381f3a8d367f24415f778db408d75d5c2c675b203436b245faf7ee5c820ba531 SHA512 073e6a021a2e87e4d8028c1abd2b300c27501fd49ed68987bba70a9ed717495d6c43190df436783fbcccc4ed904712b7e9b2d7bf624ad88df655636037aad2a1
 EBUILD selinux-vnstatd-9999.ebuild 283 BLAKE2B 348e2d0b234c6aee258347147aef3b36f9343d755f20819b6450ac6e54d5350507b8e2f300da0d0c88fd5020f0d66c79bd3435c6552bb3b1489f9b3b0f5c36c8 SHA512 014e5b5524ef0ad2d110c57409c5ba6e23a6cee9ce8b2fcb2ae744489ad0b099f4d49eb0d810838e737effcc230752cb6b5dccf574ca1de1e979f915b20ad8f9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20190609-r1.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20190609-r1.ebuild
deleted file mode 100644
index 8177e6533ae0..000000000000
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vnstatd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vnstatd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vpn/Manifest b/sec-policy/selinux-vpn/Manifest
index ff46d1644656..2f8a8f8bfbb6 100644
--- a/sec-policy/selinux-vpn/Manifest
+++ b/sec-policy/selinux-vpn/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-vpn-2.20190609-r1.ebuild 273 BLAKE2B e52da9f4595ac959526dff9f2beecd318262ef7263542eca9299ed151f88137ccd12bf41dd226306cb6d308c8b211b20a0d1f48701c6ebc282ebbedd5befe170 SHA512 3cb9270a3c00ba1524c974e25ec0fd559a884fda4d24100466d5996eb63386d06d9c3b88fbda4dcbd3119a21490798b20b5930acbac2d19894f8261fde30bfbd
 EBUILD selinux-vpn-2.20200818-r2.ebuild 273 BLAKE2B 5a40362b4251a1a109d52f300c154ded8114b8b31986dfcd29d3974addc2c0771e7ee6240fa4c4e202ecae13f177e52364c0a4331b6b94fe9349e60854b2e14f SHA512 3d1f586df3820a65db78544d057343269c99d26203fdcddef328de286047de03d73b8f0778ce4ba9dd4ce6c7b38eb3cab4a67e21fb7aa7f54a748c4529eb3fe4
 EBUILD selinux-vpn-9999.ebuild 275 BLAKE2B 4e83f9cadbd5cd4d5ce05d9f408ca3fc54c0980c17e6d7879dd72ac2b45075dfdc63f56771a3428ccfef7785f858f0f0f49cdf14016815c7aa931cf3309f27cd SHA512 6799576794c825e52d571a9853124adecb2de4614809985c2ba544a949e5eaa99cdb63e94990ff6149307cfff525c63daa0f25a0f1de7ccfdbac96796a43e4ba
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20190609-r1.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20190609-r1.ebuild
deleted file mode 100644
index 410ba76e08b4..000000000000
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vpn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-watchdog/Manifest b/sec-policy/selinux-watchdog/Manifest
index 40139477e6d7..8588befece17 100644
--- a/sec-policy/selinux-watchdog/Manifest
+++ b/sec-policy/selinux-watchdog/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-watchdog-2.20190609-r1.ebuild 283 BLAKE2B 1ec59d0cb22913024fcb6325490b989b79a293de1f563720d5191dcf0ad70823e59dee3296362a878f3f4b00dd2f24c805f5e07e2392018797996646f3448a9f SHA512 1312237f3a635a7fc0d2eb1553f000b7e3bdb2c485e486c308f7642ed0b609bd52ccbda5a4167faad82866fba3811e5b3ae3774b9fca1b79ba3c2e073ee40fbc
 EBUILD selinux-watchdog-2.20200818-r2.ebuild 283 BLAKE2B d8ec0478e5492c5ba7e0bad61c1afeca29ff3dbd9472c8abfc154ad83c2b4aa6970cae7dc9b786ecc63fc874da5f25208e66481d629e1b186dd05b5d5c92b64b SHA512 594e6624f390f7e160a016be3133c3f3c81b9b345d6eca756b7f1a63b2dc00ff88359c89573209b2ca2ef36e5cdedd38469d15fdf236287da3309d11e60978b3
 EBUILD selinux-watchdog-9999.ebuild 285 BLAKE2B 57aeab4c284bf4cbbaf8f5fc951ab29e4c42aaf064d82661d63b2f47abb786b8b682b5eae2f3e8325781f135d2ae17d091b07083b1dd65ebffc5310a125e12b6 SHA512 078443d77bae3115599cb4d9a54666927d65ea1e14a122dd2407aeb35b105880f318853b3751ba684f8ab3e717010e9bcb52b8f4237ca196c8c27e03d2e0d44d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20190609-r1.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20190609-r1.ebuild
deleted file mode 100644
index c86a01682697..000000000000
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="watchdog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for watchdog"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-webalizer/Manifest b/sec-policy/selinux-webalizer/Manifest
index 725e4a6b0a63..fb1d8ac52388 100644
--- a/sec-policy/selinux-webalizer/Manifest
+++ b/sec-policy/selinux-webalizer/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-webalizer-2.20190609-r1.ebuild 382 BLAKE2B 150c2707998435fe0966a2d90b56af04938f0ab272aa09dbe893d3744e11b6686c6504a8b3fff126e734f746050d0cd085ea6d839808a0b3ae0a70005c62bdcb SHA512 c5b8df3032eac57687a95cce16a82ef15b729786f1a5a9661f1797b30bdabe45ea4c5ebb6ca8248423fae13348a05376a8fd3f361bd62ca2f743c63e0d9cf8de
 EBUILD selinux-webalizer-2.20200818-r2.ebuild 382 BLAKE2B 972e2f5280af1462fbb02ae68b3c05fae1936ddbe8a7087015c54a21b54adb5687147392d9d8b85383c2e38037b7f66fc935acff51c5c4e4d2077d027031dd4f SHA512 6d3e837a0faea1d31ecd57079c723e9fb3d0c435fa0345fea70e1c462dee274655c6f258cec967105911942ce3588f735c6151f90766a2e2ce610ab6aead0463
 EBUILD selinux-webalizer-9999.ebuild 384 BLAKE2B a667575f6cd7a08b2f80e74210b076402051eb328594197cc2cc0cc70f198bb545110d9a0934c4c17f1abdf8070587186caa0368e123cc7888bcea0314a2e1fb SHA512 52e634a4fe49d4b9bd9fbaef015a3e9801bd0f6bbe411e4a79b6439739ab32b9dfcf77bb829d189bfaf4eb97d5803405baeb2e259e763a683f057a20430bff03
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20190609-r1.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20190609-r1.ebuild
deleted file mode 100644
index 6f7462b40d55..000000000000
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="webalizer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for webalizer"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-wine/Manifest b/sec-policy/selinux-wine/Manifest
index 468179017413..b62cf13a1ffd 100644
--- a/sec-policy/selinux-wine/Manifest
+++ b/sec-policy/selinux-wine/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-wine-2.20190609-r1.ebuild 275 BLAKE2B 0fd3e56538df2548af786f9263163c2fe0a6889e4e3924200d20685e022042ad9b3e9e2937bc242a2d0cf35f22a4889db875f52bd8e2c6ebd774b42da18314ce SHA512 faeeebc0d0f9000c7dbf605f7c9268f5434fb98c914293b8587a860cd9b24386acb38c05a2198b006265687ec16f7ba424664cf500c41299f050bf31da236d12
 EBUILD selinux-wine-2.20200818-r2.ebuild 275 BLAKE2B 2eedc9b5a1ecc1ea6d30b3b6f49c54f80e630123285a73cf9e037cf64cded25a80c57834a24913835e68944c6fe2e4666d590b7044bcab4cf8457d339cdcfc6b SHA512 65dc8e91d5e07b2eefa99d6b2e759646f789212983804a7c3646cc26f6275e9908e16e573fbd2c4eecfac812c64d1cda9c2a66d188fe0c578174aef33ff67c97
 EBUILD selinux-wine-9999.ebuild 277 BLAKE2B 70afd074935d4747e0f0ed0bef6ad8b1c4d84aca900effb832eceb0dade3c58aa1839aa6cea71e18e9420f90ae558fd205ba39c4052fafe1a5d1a95dab1af90f SHA512 287d8f4f9a215535d2e570c235a528a1f9fe715d7b73c6bf1d6fc08615fed605026dda172e4505367c876499cdec804bd9d4886ed33130f859c19b1d19406413
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20190609-r1.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20190609-r1.ebuild
deleted file mode 100644
index d782e671f3e6..000000000000
--- a/sec-policy/selinux-wine/selinux-wine-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wine"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wine"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wireshark/Manifest b/sec-policy/selinux-wireshark/Manifest
index ca4640a7006e..59b367d22b29 100644
--- a/sec-policy/selinux-wireshark/Manifest
+++ b/sec-policy/selinux-wireshark/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-wireshark-2.20190609-r1.ebuild 285 BLAKE2B ed7bdd340f4cce9f367d24d0e6fb02aba83da5cf32bd258c13ecb5363a6c6f9eaca3f8662f39cb0178775515707aa36a3063220ed9816de8f8b7af4aa375f8c9 SHA512 2e1a00b2cb510131cd8fbea60649db98046255d0eb80907cc79357f7586764987b2b198aa008a52167e9d0a04566e5455d4217e2a4ce80367fe95bb231979050
 EBUILD selinux-wireshark-2.20200818-r2.ebuild 285 BLAKE2B 3359158378cd980a3f80c182e30be453c9e89ea0ae32ecb2c6c3c76643373a17c7be57211a30d07159199fb89c2ffd73b7bb1e9fc429e07bd5c997c01ac20ddb SHA512 0b96eecb62eda8f181370311da790f7f3073250df3c73164bcc291995daac6ec9ec7760d57f1bb312e00176bcd85dd6161c23a6c3ab7a25b43fb18c688635f6f
 EBUILD selinux-wireshark-9999.ebuild 287 BLAKE2B 0d0b155d2bfa55d0009c112276938083d96026e2c2bd7c9e5201da50b0b5cc1ec70cf93ba9ef9f5159ac33cfbe03633c850787f8b773daf8eb2348d76d15a9c0 SHA512 78e72cd2f9cbad3dd1c0d7181e5a54a37ba6618646c948e92cc32107b56785127d9b16f2c4721bc761c64f878983c331ccd418d71a87dfc682cb498cd460006d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20190609-r1.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20190609-r1.ebuild
deleted file mode 100644
index a1fbdb3141ad..000000000000
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wireshark"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wireshark"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wm/Manifest b/sec-policy/selinux-wm/Manifest
index 72889937a1e9..aa6e4b232f83 100644
--- a/sec-policy/selinux-wm/Manifest
+++ b/sec-policy/selinux-wm/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-wm-2.20190609-r1.ebuild 271 BLAKE2B feddafc4369b99d34917fec85039c0b38bf1c935881af4fc960dacfdb53545f4a3a87dab1aea924ac85011768d8bc1802d96bdfe96e98045bc61df581f46d464 SHA512 f6b17c011dbb69844b84b1fb7a80ec83d4511575965bca055e859ef989b0a3b54805b38d4813ce569475e2a15a8f91b73b511deaa350a62ef05427503e4737c2
 EBUILD selinux-wm-2.20200818-r2.ebuild 271 BLAKE2B 6dc45de5877278b3de4eca6a8b4b31d08727f20f22dfcc9ca753fb43eacac18b1202fb664539e481f6b48bb0f809596b218ffdda4078682592a689c5820a9fa5 SHA512 301b5648f5246b8c8a54e2415651c74458656d2b05d5f3c0403965ee9b24880db3e4453efb4e14fdd737be77d6d56a8f7e0a6d75238289c8a2344089474c6b9b
 EBUILD selinux-wm-9999.ebuild 273 BLAKE2B 37960c762f840d016afa142f076a6c13cacdbc4d11ec101ee14d903d10bb54c7837723f14e810edb3076080747155d2d8551a2525dd8215097344a654d211232 SHA512 bf23b421ac04c12936eca6238796133a404270c8c30bc6e2d98a4ed8235cf18f1121cf1a96315fde694b2010c3a30163d35a0a9d530d785984b8e2d25e84a1f6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20190609-r1.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20190609-r1.ebuild
deleted file mode 100644
index ec73f98a2807..000000000000
--- a/sec-policy/selinux-wm/selinux-wm-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xen/Manifest b/sec-policy/selinux-xen/Manifest
index 45a21fde4ef2..b6e07a3ac945 100644
--- a/sec-policy/selinux-xen/Manifest
+++ b/sec-policy/selinux-xen/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-xen-2.20190609-r1.ebuild 273 BLAKE2B 5c8d8a3eb267a918fb4d857e8283451676b6bbd469cd8af1da4c4a9f791c513b022e626f236bb0c41d8734a50bda32abea2e61a0fbf9cec377ee0a38490651d9 SHA512 12d9d1d2ecacd012b8d36262af75f7ce9b9910d5947b8d6f393e6d7d93d227d2f250dc97e5de3389d22e16fb91992f33b33acfffa89ff042ed7d7477dd82ba17
 EBUILD selinux-xen-2.20200818-r2.ebuild 273 BLAKE2B ef5c7d230c4e17c9bed740ea323c88a0b93f98dbc9e3889596ecc46e5948ccd26d7a9ede880879f55dfcf27bf75f9accadab307774c22df24d2479ddd6916e80 SHA512 709853c2240def44fd617d9e39479a5418e0ba3508d743f6f5921797cf512ca646cf73e94c677d643023d0a59100d7fd2458c00ec50523fc8fcc6d96218f7c70
 EBUILD selinux-xen-9999.ebuild 275 BLAKE2B 653f0ae36484b9b25b7640413100a6dd60c842acf68c0fa375f4174375a4746f7dec3b322735a840852466309a559483fc006bbae46023a07e860b009705b9fa SHA512 1af9cc048a27137e461d60252ce099dbb2297def65cd46451a04db42a37693d7398717fcf2ce8cd4282092aefa8252448b9c3c7901436624ab6e0bae42cb6610
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20190609-r1.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20190609-r1.ebuild
deleted file mode 100644
index 98105b7026dd..000000000000
--- a/sec-policy/selinux-xen/selinux-xen-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xen"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xen"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xfs/Manifest b/sec-policy/selinux-xfs/Manifest
index 0563c80960fc..c5e27b95d5ba 100644
--- a/sec-policy/selinux-xfs/Manifest
+++ b/sec-policy/selinux-xfs/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-xfs-2.20190609-r1.ebuild 273 BLAKE2B 00ed3ca31777de3c935aa226070ea7fca903949078434035569bd00303e3f7c7169d3ebab4bf8c4fca9a2ae97e6ab55be2bc98758eaa7bf8defd8d83457321eb SHA512 8eb4d58ab62da2310ec6f75d85c0e0a1a2390835c5ace4bac6b4ede130955cdca125c595f2a1e93779f930b28b7d63fae62dae52146a1ef845b620af8fba5de6
 EBUILD selinux-xfs-2.20200818-r2.ebuild 273 BLAKE2B 63e2d3ffd5bcd68c4800342829e12f662acb8c4e59e96615b706f7e9fe9f2e71d1b4d5e9ce542a21d3c4c812ca2b5836880d0a5cbe4f77e4a503487b8c1af20e SHA512 2813a75959774eb9ea35986d99ccdc49fd20a5b1994e7a625a5c58b29791438fda455b1b27abcb8b25d386646ceb1712d301c4a8a15336ec2c6a865254ea8a7e
 EBUILD selinux-xfs-9999.ebuild 275 BLAKE2B 97a4bc106ebe013142a56235304806452602c5621f6e8848a7359aa1e5c8872f2b974b070be6d2aa8266e2f7e75f720fdc28e4d30c2210509eff6cb53758c6f9 SHA512 401afd3dfa55c3c49a1ff8e82643b553b150e756807c616d9cb9da32e7e69d139c04d695537beb56c3fcaff61c644f95e5acdeaf4ff40350a78c1ca4208dcc57
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20190609-r1.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20190609-r1.ebuild
deleted file mode 100644
index aaf98f5fe9af..000000000000
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xfs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xfs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xprint/Manifest b/sec-policy/selinux-xprint/Manifest
index 2f687a52afa2..0811d3669e28 100644
--- a/sec-policy/selinux-xprint/Manifest
+++ b/sec-policy/selinux-xprint/Manifest
@@ -1,8 +1,4 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-xprint-2.20190609-r1.ebuild 279 BLAKE2B e9da20cc39ca840072cb0a6fc3756414c1e5bf7d2084f6d695613926dae939dc73ec2463d211aa64cedd3ebb9b0cb368de9546d75a2d036429069b6a14e3420c SHA512 183588aa3c252a5df4f873d23729291239b8c0a73562361ccc9196ba549c7fa6108236a10ebb9ca78ed8a3f7cc39d0688178e6fc9e17a9e73ee844ce81ce4036
 EBUILD selinux-xprint-2.20200818-r2.ebuild 279 BLAKE2B 83a0df8879cac56518ccd2eeb9e71d1782c436a044aa5fb91c65612ab0bf425a836f2589105559752044f3fcae2aaa7df7945fc0f8bae23f8f45a4f57b2959bd SHA512 c332c14843f4463a6b504524c665e3c4e8ae5394110412cdee65632c697658d0c6aade3184d87288d88cc69b7761fb14d830dd09df558837291ab08bcd3b882d
-EBUILD selinux-xprint-9999.ebuild 281 BLAKE2B 7b974b64f966c9f87171bc8447fd97da13c161e32673a43fdeb6be1ceb41790f1da5e460d023461989dcc191a9dce6dfab5f30ac1c0875492b20446cd33156ae SHA512 f8e32fb4960dfeb9f6b93287f497e16cb192c81e2119f1c72215279b2a05cf6d6643bbd4a0a1bbbe079d72c2667754c7ca76d13032e966dc9309c0c505781f3a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20190609-r1.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20190609-r1.ebuild
deleted file mode 100644
index 5fdeeaee49d6..000000000000
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xprint"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xprint"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-9999.ebuild b/sec-policy/selinux-xprint/selinux-xprint-9999.ebuild
deleted file mode 100644
index f1cb07cabbd4..000000000000
--- a/sec-policy/selinux-xprint/selinux-xprint-9999.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-IUSE=""
-MODS="xprint"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xprint"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-xscreensaver/Manifest b/sec-policy/selinux-xscreensaver/Manifest
index 5e45c282df62..abbbe5162aa0 100644
--- a/sec-policy/selinux-xscreensaver/Manifest
+++ b/sec-policy/selinux-xscreensaver/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-xscreensaver-2.20190609-r1.ebuild 389 BLAKE2B 7ae12eb40aca72fba630e5802ce603690b57b289fa605f5eee2ed68bb6b98bf516d5ef5a09e16d21564bf45b96f66b56cbab4581430b2cc6314c6aba12d6f620 SHA512 ee579a742789726b6668e8b4bb66f9da39e30bd5ec423af1966bc4b181ba5f7cbc7bfae7730c11a23d48c9e8b0b3f82912ea2685fdd28f769b35c074370543e2
 EBUILD selinux-xscreensaver-2.20200818-r2.ebuild 389 BLAKE2B c9c6032377570b4642e47678dd1b59c95e9754fb135b430840b2fffa1f9cf7c3f34d16996d7b0edb917e617ad56bf831913ad1cd48559339f41d38ef30b40321 SHA512 c13a433b28bc519f66781613a57cb6b249bfb22dd47086f379c560161c5153491afdae3aefe8b194a015485997e262f3ca2ce821683fa2f29d76eaf818f92f37
 EBUILD selinux-xscreensaver-9999.ebuild 391 BLAKE2B 6f474026899073c206fce9b39443937e95ad7de8de6b07d0cee091aba287da07f21e11df03ca70bf4526e6c4d98308f337b564700c340817330b9b1b5c3a38e9 SHA512 f26f5fd009d64883a1b49ec2da8b6293147ba6557036be558127490c88c394f7c803eb5090b7e9df3b3737ca2445b9776926817402864875af85ef88809140ce
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20190609-r1.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20190609-r1.ebuild
deleted file mode 100644
index 19aa684ca051..000000000000
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xscreensaver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xscreensaver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-xserver/Manifest b/sec-policy/selinux-xserver/Manifest
index 6cd56c082f7e..b152bbc9dda3 100644
--- a/sec-policy/selinux-xserver/Manifest
+++ b/sec-policy/selinux-xserver/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-xserver-2.20190609-r1.ebuild 281 BLAKE2B 28195b2ea31c6f9b091990a183c4f69faffa0c4d5f633edda8fcffeaff320c7f886065d474b05012d070a0c87f762421bfd4ef45f3b67d0a981c844ae6824b62 SHA512 17d01cf4a01c0530cfeca8228cef603f3811cfe068a09004525d8ca43c04c862f6e57d99b7229bb57b218eb2b3c85a8cf10f6821464c9259cd564df968978674
 EBUILD selinux-xserver-2.20200818-r2.ebuild 281 BLAKE2B 1fcf4f906db0c884e057fbea642095f34392725c2fe611c47860b9192ae50959267f706957a4344b05cc8a9859e7d4a752970edbed0ed3a7554239ff4da6a819 SHA512 9c2624bee5c97b1ae49a51577030647a48b3334102d62fe3b201aa4848de4cd057ec69e851917877d8263c0dd57518b83f277deedcb8384ad1f4f1b71344cec9
 EBUILD selinux-xserver-9999.ebuild 283 BLAKE2B d90646458e2c993343da4ff76f54a64e64e8e7209bfa274a10ceffcea5e2a412ecd1d9828163b426bab935e3a102183fea862571e835729ce0f4612988d3da63 SHA512 9ff754e4b5d74de7c24876d91a079df2edd7f97f7c1f48fa3e94f4d128d1714645554839696db4f213131343b774142b8a6c90c1f9ab8aee9760afba267c4448
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20190609-r1.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20190609-r1.ebuild
deleted file mode 100644
index aa953c3b87cf..000000000000
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xserver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-zabbix/Manifest b/sec-policy/selinux-zabbix/Manifest
index 5f35ae6bb23d..cc585cd8474f 100644
--- a/sec-policy/selinux-zabbix/Manifest
+++ b/sec-policy/selinux-zabbix/Manifest
@@ -1,8 +1,5 @@
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-zabbix-2.20190609-r1.ebuild 279 BLAKE2B 9b7bd2f98af01553301ebc6e03534644be7f5941496ae97fa42e083480113fc808f10d347ee8f8aa16b2ebbcbd00956694d702866977ee19caaead0b11e74bec SHA512 0fde234a371633521694b64cb91f3cab8f4eb16bddf8dd45c1181780eaa21ea04bd8589357c6fd404715a1603579ca4cd1139d72581e57cd09fc7f35e4e65b26
 EBUILD selinux-zabbix-2.20200818-r2.ebuild 279 BLAKE2B 733bb1edf6d7b08dc8a6210e66f0ece2b7b305e29c8d49cb8a560da4b2d0d0ba392dab879d6668373e960c3510073c87441a8b3b017ae57a7dda7e4ee128370d SHA512 67b33739b2026aa0d0abb48dabf7324d9a6130c1129a37ce7e6263562d470f18fb0dd06e93b546b1fadf540575014a6ad973a55d093355fafa9a19f593171243
 EBUILD selinux-zabbix-9999.ebuild 281 BLAKE2B cfe7c2b0d92755068bba1d4f34844eddedbcbbfd098910dadc0b66040a3ce4ad18b3b8822f7f6afee2d4a6e6ce39d421e4efad94448611aa542bf90140b73158 SHA512 726a0debb9b22c1b22c5ac9c3dd6ba4e2079124bbb4ae1b0ad144dc98c326428585a6c676d1874c3cd2d7d1576007c58e437e8314b2deb7332abf5b51051894b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20190609-r1.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20190609-r1.ebuild
deleted file mode 100644
index 42c39935e146..000000000000
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20190609-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="zabbix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for zabbix"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 349896201465..76b0c63cc944 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index b1fcb019b1b5..0cd58485493f 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -2,7 +2,9 @@ AUX logwatch 125 BLAKE2B 93e0bb2e65dda3a81e1bf560c06a3739fc2226488492219fab47832
 AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2632af8158fa3346e8784db2a6bf9aa90c04768743aee6eaefae517feb9f7066d748cae894c1a2299 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd
 DIST logwatch-7.5.3.tar.gz 495110 BLAKE2B b28d7381d259a132de7d9fd347ac4bafb44440b187aa811f3d3f65d7b1ccbb00c6b5bb660229cd8155fa5d7bc9668e7b4dd1ebe7bbb909b48367c6a6dd6793e5 SHA512 ad404f031fe016599a8f8d8c0820b23db61a9ad102815d3713e5d13e9a810c819ca7ad9cea50891852982e073ef033dbe7595fde8846971336148e32cbbe29ca
 DIST logwatch-7.5.4.tar.gz 481766 BLAKE2B d86ae3afc33a100fc353948be3591cd13566568d47cad02fa5f390882a223ca9d4d78692214f2f0898fa8bf8687314f60ad9ce02f0987bb86dd7136150a1d2b9 SHA512 6e6a5e8b7ae977244ea97895e06cccde320fce3dfbd2b1c58c945fc8872325a9676c8afe122b1f7230cb6617b64813caf90ef37fc472a1b200eb0b24ea72fa9b
+DIST logwatch-7.5.5.tar.gz 474167 BLAKE2B 3e4183ea6dad4f415987870c555391d2a9496b4d4d894f1c06336876077b2a72e06b4e3f8d272aeb65aa5ea14f5f4d17a6f461ae54b2e50f073fef58a27a5241 SHA512 71df4d69d7e580b21dc0a0f813201822a161ada68a19c6d3f0df9c8576f22c8d43ebe90643d6184e91ee1c6628de9501896a9444ff7ad6af6fe17eba5d3573f2
 EBUILD logwatch-7.5.3.ebuild 2431 BLAKE2B 57e90b95f542f37bcc9c3353ab6992304d3ac1ed6ce7ff9652657e88d74f6f76eefdb0a064dab7dde622c866eaf589724bd6364f09d5f1c96494518780f53817 SHA512 317e2fd99284bd33e86deae1215e0d593343aaa888d0bf51c81c24d85b491d853744e0481f0795d48bbf6ba39f43ac024841dfa8c7bfe66a223f6d7e42e1c6b2
 EBUILD logwatch-7.5.4.ebuild 2431 BLAKE2B 57e90b95f542f37bcc9c3353ab6992304d3ac1ed6ce7ff9652657e88d74f6f76eefdb0a064dab7dde622c866eaf589724bd6364f09d5f1c96494518780f53817 SHA512 317e2fd99284bd33e86deae1215e0d593343aaa888d0bf51c81c24d85b491d853744e0481f0795d48bbf6ba39f43ac024841dfa8c7bfe66a223f6d7e42e1c6b2
+EBUILD logwatch-7.5.5.ebuild 2438 BLAKE2B 68c2ec79f3bde424b897dc551afcfcb1081c1264513ac753b2303183dc2ae906fd7bc77b42eeb1db0132e2fe8be56cb4cb2cab1965577c051adfe19d5e5a7a31 SHA512 945834d780b7e905055740b3b7f1eb9018d13c405a38694b157577d4947797b2b943669e6d10d50a3e27f7a5ffe404ee46cca384e2f8f6ca93d0418742445e17
 EBUILD logwatch-9999.ebuild 2438 BLAKE2B 257d42e1e27297affbf91e91375ed1c3c759dee0159a63f8bea3b3d0448d27b8bc0c852434f4278df89636c5fcfd40c8eb8184d099491c5dace1f1b49bfaf326 SHA512 acfcdb3949bbcb72caab77a5843d2e46635bbfb1f88d262325488317e216c7b6c4fb07ecc48ea98b9cb14a97ffbe9745385ebaf8b66e9801dfdc6bfa6fcc5258
 MISC metadata.xml 328 BLAKE2B 623e92420ca1fde8b78ac6142444544897284af5e74b610d2e6cac823b97355fc91bcad0ea3bc7ced3286e1bdf6cc2b340a34143b31529424ba9d90209b7898a SHA512 5feb78397d5abc4fc758c61c2c972032eca10f9fcbdbb6efcbae764c5ab1aaa09fd4f9a31082682dfd8e0ff865147fff22787b8d116bc7a954a4fdc42cf7b3e7
diff --git a/sys-apps/logwatch/logwatch-7.5.5.ebuild b/sys-apps/logwatch/logwatch-7.5.5.ebuild
new file mode 100644
index 000000000000..3bc98aecc866
--- /dev/null
+++ b/sys-apps/logwatch/logwatch-7.5.5.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit tmpfiles
+
+PATCHES=()
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Analyzes and Reports on system logs"
+HOMEPAGE="https://sourceforge.net/projects/logwatch/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/cron
+	virtual/mta
+	virtual/mailx
+	dev-lang/perl
+	dev-perl/Date-Calc
+	dev-perl/Date-Manip
+	dev-perl/Tie-IxHash
+	dev-perl/Sys-CPU
+	dev-perl/Sys-MemInfo"
+
+src_install() {
+	dodir /usr/share/logwatch/lib
+	dodir /usr/share/logwatch/scripts/services
+	dodir /usr/share/logwatch/scripts/shared
+	dodir /usr/share/logwatch/default.conf/logfiles
+	dodir /usr/share/logwatch/default.conf/services
+	dodir /usr/share/logwatch/default.conf/html
+	keepdir /etc/logwatch
+
+	# logwatch.pl requires cache dir (bug #607668)
+	newtmpfiles "${FILESDIR}"/logwatch.tmpfile ${PN}.conf
+
+	newsbin scripts/logwatch.pl logwatch.pl
+
+	exeinto /usr/share/logwatch/lib
+	doexe lib/*.pm
+
+	exeinto /usr/share/logwatch/scripts/services
+	doexe scripts/services/*
+
+	exeinto /usr/share/logwatch/scripts/shared
+	doexe scripts/shared/*
+
+	insinto /usr/share/logwatch/default.conf
+	doins conf/logwatch.conf
+
+	insinto /usr/share/logwatch/default.conf/logfiles
+	doins conf/logfiles/*
+
+	insinto /usr/share/logwatch/default.conf/services
+	doins conf/services/*
+
+	insinto /usr/share/logwatch/default.conf/html
+	doins conf/html/*
+
+	# Make sure logwatch is run before anything else #100243
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/logwatch 00-logwatch
+
+	doman logwatch.8
+	dodoc README HOWTO-Customize-LogWatch
+
+	# Do last due to insopts modification.
+	insinto /usr/share/logwatch/scripts/logfiles
+	insopts -m755
+	doins -r scripts/logfiles/*
+}
+
+pkg_postinst() {
+	# Migration from /etc/cron.daily/logwatch -> /etc/cron.daily/00-logwatch (bug #100243)
+	if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
+		local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
+		[[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
+			&& rm -f "${ROOT}"/etc/cron.daily/logwatch \
+			|| ewarn "You have two logwatch files in /etc/cron.daily/"
+	fi
+
+	# Trigger cache dir creation to allow immediate use of logwatch (bug #607668)
+	tmpfiles_process ${PN}.conf
+}
diff --git a/sys-apps/miller/Manifest b/sys-apps/miller/Manifest
index 55ec898c869f..3481edcf1905 100644
--- a/sys-apps/miller/Manifest
+++ b/sys-apps/miller/Manifest
@@ -1,5 +1,5 @@
 DIST miller-5.10.0.tar.gz 6793426 BLAKE2B 25ec96e29ee8d913feffd6e9a54cd2d494c9050e180556ed462a6d94a6adaaea88dbdbc09b4753f8888673bdc33a1f0aa43f9dac37bdc3c25191b2a565fe8847 SHA512 a7cbaee9ad4075d27e74ab3a60297164c535ea2bc1e38128174f4f226ad061850d37108e7d7547821b7e6667cb9a024639795d7678b1897fedf6ee15d6064538
 DIST miller-5.3.0.tar.gz 4940072 BLAKE2B 2e34ae010d409877040a60b08dd615f32e6945ca3bf97c078c89b9d2811067fa4bca2403f8ad239f8245e050acb10305d351b1db4177541a4fa9ed9a4bc1396c SHA512 4c557d97eb1cda2e52093fa097677602491895dea3093776a03af56114022b8c0917df9fbf26071d4d1a3c1360f520c82e33b32635c7b4207fa62869ab564712
-EBUILD miller-5.10.0.ebuild 1047 BLAKE2B bdd7d5d896950ce6c0ce71921839a51d6adb56b96224f9a811a1b5bc52a52e1d7074b4f60e4a7ff4211d9cac34560df3e0e15d8f5ad608cce763e5657c0ba4b2 SHA512 d7bcbbff6133465f6bf31a8ff783f22c60cd738a191ed1ebdbb7217c0dfe66b541ffbdfa467503d59749234c16fd3ec8760ab4d29cc00ee2bccad31268833486
+EBUILD miller-5.10.0.ebuild 1046 BLAKE2B 37539bbb712bd93b5658e02437c5ded72f10104887bc8996080801f29d79c7f9ed52249b14cb96cc7e85c780f4df32c84d78e0970fd038ce473bba02e0aee219 SHA512 c18294e1dbbcf5f275833cbf38276522021ddb8f0ef8bd2454f4a012cc26a9a36d3ef30d5ab1e88f1138bab69a543025dc694e0bfb0fad7e28898aa4320fbffc
 EBUILD miller-5.3.0.ebuild 1043 BLAKE2B bd9aba828d1e446d70ef561f9930eecf7ffb02030c03d03c779122d7e0d6362f8ddb7bde63a609b253aa5be45fd384c81ad272279e5835cb2ed573422b83faba SHA512 28594f3915eaa1e7bf01405db64a14551d476eae0ece718bf5c7c1ec36a78cddc037c04ceb500a599ab69a6bb4b2ab109e9720e6a1e31a7a216637a823764be2
 MISC metadata.xml 245 BLAKE2B 183034a40812aee01ddfd5d59eac1d2d1d42d281575fd5a3c900bd96af21cad81f9262b41f81c39f34dc60078ffa3db70149f8d50ecb09cb6003ed8602ab3ecd SHA512 b7b2cb8f6f35a36afa6a90e1d66747c2bc3e26a202483ec1d5c32346e75a738ee59be158af291a18c55140486d519c159492d12e3d25134ec20cc03fd7627cad
diff --git a/sys-apps/miller/miller-5.10.0.ebuild b/sys-apps/miller/miller-5.10.0.ebuild
index e0e1b73a7b1a..9bdc7c43483d 100644
--- a/sys-apps/miller/miller-5.10.0.ebuild
+++ b/sys-apps/miller/miller-5.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/johnkerl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 589cb64650f3..902982b37619 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -2,5 +2,7 @@ AUX rngd-confd-6.7 2245 BLAKE2B 7643525d9a57479ba1b725ea6f976421c3df990c56d9f694
 AUX rngd-initd-6.7-r1 1683 BLAKE2B 34bea128a94f2fc8479ebd8e8a398a01bb96dcbe8dd74876f8b8725f701862908448deca3768437d1cd98b138c9203106c199942910f63e7c95598d3e1b27818 SHA512 c1e3d94509d5cd3301836961598e221ef0db2e7310386f0467a4f3068eada8ad4010b063202b8a8c3d163d39799aea7d6a4dcb4d8ca569fe7b51f5c870100b6d
 AUX rngd.service 133 BLAKE2B 1c3059e7ee924b42bc6567f5142973d550282248b3e49053b96782039ebd63096a0a8960d3e5a43cfac1d505c57e71015ad706099f06ac2809adf52c0b108d7c SHA512 51e9ea84b624cda8d3689d6a9a8d60da4a556aa9d2a1a04e698d9a1490717aa47172e152c93711f8d04be8a5b68b1dfd568a762bd8ee7219afb7cdfff15657d2
 DIST rng-tools-6.10.tar.gz 56806 BLAKE2B 6cce0579a47f638cd90b51ba5216712fe39bf92dd59b288691a5e9783d520212cfb62e875a7e8f85de7a932568fdf0287cbea6f4869c9616a4c9325a111b0243 SHA512 b72d8918f709989ebc70cb9ea9c8b3dabf53041b24bc3f3a6de1bea318861dfd6c1a6110bd750041dc4819406db4a2b28f5137af5f5d5f2beb666f607913b389
+DIST rng-tools-6.11.tar.gz 57366 BLAKE2B d613502bcb24560638c0abc956987e57ec54b6594bed414ce2b70086716f73a9a9eec4800c86097c4a14b91401f0f28be62f5182ee01c328c9a32cd79eaec561 SHA512 0058ca5d0c1ddb554284fe8e6b9c0b85f130e0b9e0b9f0f0219f434302766e07c321d4fc0c01bdeb59053d5cd14dab67dc1c306422ef35a62a267af9fbdf7deb
 EBUILD rng-tools-6.10-r1.ebuild 1859 BLAKE2B dbed15bdab91852dc931b593aa9c5a625aa77b7721827d9edbbf5005beaad20d88aa086b6deebbc3dbccd59179c36a0c24e8758fb50d6527ed3a405759d9f9a8 SHA512 5125b29f1a842e590e94e3808617378a0a05908a584c52f1ad52ae60880c163c6cdda72b2b78269a47f912482163d5807b9b282b50418bcb45c8b763f67a0399
+EBUILD rng-tools-6.11.ebuild 1865 BLAKE2B 84fbbe4c5bb4af42c2f31c8be67ff8c3fa0b9b838bcbbfc6c0cf7a04881f748b847038e0df3c7caad3540108997eb67e280a3e9462452f6831e754eb1996fd3f SHA512 356a1f6752423100229b3159d0c2a538ed9afd84e35fc88bd43976e22d5bea13ed829357b1d38c48fb9210045b0b070809473a25517eab14a701a212cf78dfd1
 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/rng-tools-6.11.ebuild b/sys-apps/rng-tools/rng-tools-6.11.ebuild
new file mode 100644
index 000000000000..3e3aa014ffe5
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-6.11.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Daemon to use hardware random number generators"
+HOMEPAGE="https://github.com/nhorman/rng-tools"
+SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="jitterentropy libressl nistbeacon pkcs11 selinux"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-fs/sysfsutils
+	jitterentropy? (
+		app-crypt/jitterentropy:=
+	)
+	nistbeacon? (
+		dev-libs/jansson
+		dev-libs/libxml2:2=
+		net-misc/curl[ssl]
+	)
+	pkcs11? (
+		dev-libs/libp11:=
+	)
+	elibc_musl? ( sys-libs/argp-standalone )
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-rngd )"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
+
+	default
+
+	mv README.md README || die
+
+	eautoreconf
+
+	sed -i '/^AR /d' Makefile.in || die
+	tc-export AR
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable jitterentropy)
+		$(use_with nistbeacon)
+		$(use_with pkcs11)
+		--without-rtlsdr # no librtlsdr in the tree
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/rngd-initd-6.7-r1 rngd
+	newconfd "${FILESDIR}"/rngd-confd-6.7 rngd
+	systemd_dounit "${FILESDIR}"/rngd.service
+
+	if use pkcs11; then
+		local DISABLE_AUTOFORMATTING=1
+		local DOC_CONTENTS="
+The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
+to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
+	'${EROOT}/etc/conf.d/rngd'
+reflects the correct PKCS11 engine path to be used by rngd.
+"
+		readme.gentoo_create_doc
+	fi
+
+}
+
+pkg_postinst() {
+	use pkcs11 && readme.gentoo_print_elog
+}
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 6760e5e93ba7..57f06e4ecfa7 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -16,6 +16,6 @@ DIST sysvinit-2.98.tar.xz 127028 BLAKE2B 302219cd0753dee20772d78ad073e279f430ede
 EBUILD sysvinit-2.93.ebuild 3565 BLAKE2B b299bb15ec4a6525f033f74b1a853d351545fe34807bf1b17716e92736582adb023ef0e4c5b8f745d37699a51067c1577e8b06cdd11e3f50b2f7eea445001f6d SHA512 e390b9560cf58f6f25ab9586dc5203ee8232eba0073348cda085f091216675458e4f5c0203013ffc93a8641697bf8827ffbdf382cc3243f118e081e84a43e974
 EBUILD sysvinit-2.96.ebuild 3834 BLAKE2B 8b33ac1730e961d1c6a2a07c5489f8393471616b94ca1ec6a401a92786e6adf28a1ecf4870e3f54c9d95f22925a5c8c4671f07d582e87b0119eadef68b33a6fe SHA512 62685deab0a931693dcfbb4ca58a73cf71538cd56ea97dbcaec81807b23011c5bec01c4ebd86a597b7d6c6d1c3870456a4542febd9a4fcb28f135769dbf910b4
 EBUILD sysvinit-2.97.ebuild 3955 BLAKE2B e8c55bd2b99b1bd32dd298911a4e6a83e36c5589e1af29f7c55314428dce9fbd335dcc2919f6401cc4e55adefbe12e02f5fc7d7d4db39247844e86f307271761 SHA512 045dfb3b3f01db57781b87fe2ba6561fd78a713e7b9636dfdbf9193b1eae5a1414158ade0969b426737e2c8d45c4c9ea8921c5bf4f60b756191be4eea895cf29
-EBUILD sysvinit-2.98-r1.ebuild 3972 BLAKE2B c7c1da438cc7205e7a64da5f8b552ff490625e836a5077fbd4944897117d52906ef0536dcf6d19468e614a964b05fa60c8ff68baea84e874aaaf7ba3628af66d SHA512 6b45508d220613ac4b1573969165a576d6ad5e2700fd0cdc276954fc1f08f47167f2e44cc631568e3cc33a7363569192552381120e7112c28b3a01c5390e04ea
+EBUILD sysvinit-2.98-r1.ebuild 3970 BLAKE2B ae65585a49a850902c9b96c237b0ec53e450a28bc587d49f6faf6ff76a9ccc93f542afa16632969e3fe6b3fcc4dd7ef2896a34727c3c7f3584c00af1401badd5 SHA512 b3e1e541557830dcf2cc2f55e1be9639b010bc7d0e843e5c2bc6a67f73dbd5279589f17d3062dfeb8746dbd89647f49af0d3207c2ac70be4e14ea2e7f8e69202
 EBUILD sysvinit-2.98.ebuild 3969 BLAKE2B 1633252f3fd5655e6db87c4afd6ca0ff53a4901e63fe0ab9bd2f23f123bf69d6d062ce6d587baae0062d6bae86e4b41b15bda1d8e1567f3573f7f5c81e62cc2d SHA512 f3da1dde0027a1ff82d0c8674d3e6ce35bb04a5d87e34c0948806a6dfd72e1c7c176987b8e35dacaad06772a5f6f1ac8f25cc24d730bc5c144824305aa5232fd
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/sysvinit/sysvinit-2.98-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.98-r1.ebuild
index 3fdd9425576c..3d7822e542af 100644
--- a/sys-apps/sysvinit/sysvinit-2.98-r1.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.98-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
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *beta* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="selinux ibm static kernel_FreeBSD"
 
 CDEPEND="
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 071c64c34edc..fc27453db863 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index fc1697848354..07763f3d3b70 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,4 +1,6 @@
 DIST pambase-20201103.tar.gz 3295 BLAKE2B 7e104b5342842a21e10dce6e5c5a2d330ec06146b4791b888518463d915eebefbd694a809ff676b32c9c43945087935dc5c3496ae93ac17b7e4fd4e2e2974d1a SHA512 b94e47780f45c5e897b5fd073ce2184a901d241d51516ac5007658b1ae423d0f34c37a09a9e1d055962aa7158675ea7740dfe6466fad5e4a1b50b66a0812f51d
+DIST pambase-20210201.tar.gz 3346 BLAKE2B fd9183ec91062b88ab0f013a955fcadfe48c105a2e31838a6a89b2e5a58313ba3376971567288d609ad6f080743e587e5787ee307589b890a397969bab42e108 SHA512 0a45415284c64c706b30fc0e75c4c541d897e8876f0bd04e28cf73cc2a907e2ed48bed6472e355572a5a9cfb5508666312f225fcdedc370380fadac2077fef3d
 EBUILD pambase-20201103.ebuild 2772 BLAKE2B d953df87a7801ef83ee9f1efeb6a9fd9f9ca3c2713004b3fb6ad853903a36e21fd70f17dd9eefabc5483ff6141238514487ae491afa98908d2f4c121b9597d91 SHA512 c43f51170fdc005d2fda51e3ab1eeafcf9ce6a3bd84ddbb63aa608e9f5548b1bfb367c8084e9b08f6a621d77298682d3ba8192baad0b641183b4bdfb8db47436
-EBUILD pambase-999999999.ebuild 2772 BLAKE2B d953df87a7801ef83ee9f1efeb6a9fd9f9ca3c2713004b3fb6ad853903a36e21fd70f17dd9eefabc5483ff6141238514487ae491afa98908d2f4c121b9597d91 SHA512 c43f51170fdc005d2fda51e3ab1eeafcf9ce6a3bd84ddbb63aa608e9f5548b1bfb367c8084e9b08f6a621d77298682d3ba8192baad0b641183b4bdfb8db47436
-MISC metadata.xml 3810 BLAKE2B f4485cfec915c9e239c9328e6df338ba787ab26c3bb4f84773aa29361f4e2c48b56afb787c176fb38e8dc1c923e07c5baa6aeb5dba2774fe61f20250baf36b7d SHA512 ea58b1a801e68eeb8b7325192f5f26b406879bb70a46383222ffb9f69c71e5f9803532f2cca510ec0bc5cc3a96ceb165ed11725341a51b123fe8d4a712f4c26a
+EBUILD pambase-20210201.ebuild 2898 BLAKE2B 514d785cb2a0466ea47687c297afa36ac2d8052400beff9e8697c22b470c980369071038cad9693df6f36b48d37f23e4b27288a95e41bce1b325fab0ef426cd7 SHA512 1f272617eedcd27310bc6ab55164bcfcbea83f91e178f6d7f561569b551f5f57b21fc149577654f1fd1b75499414c4bbc7e5e59e43a54436c8b396bc831ea889
+EBUILD pambase-999999999.ebuild 2889 BLAKE2B 9e390cbaa743cbf1cb2172f93757672462785a6672bfdf77013a3ae6c930cca5ae55fde3ce0a5c12cc887d805d4eb42edef41f3f8dc0002d63ed75e5e0412c55 SHA512 d3f635a0caa16712ae211d8faff05611acc1f7203b88879b36de080c6902b9cfef70e0cbdc889b9925a8baaac6decea5c939e5aca22c780209ccc2eacd3c8af2
+MISC metadata.xml 3934 BLAKE2B ca15cea69fca97ebe00c624a8bf63293a348446b9cf6a2450338087b894f68e35cc5de037119a9534e4046e7ba6364e60397749d6ef4678f3220739603a77888 SHA512 9550417607667acdffdfb1ca9936bf697ae995a42d8be788d7215a8231bff8d92ed0caaa926450234f4720d6731efa6b9ace35900a3d6a0ce9040574399ccb77
diff --git a/sys-auth/pambase/metadata.xml b/sys-auth/pambase/metadata.xml
index 6b0d63269f7e..d9afbc2959ea 100644
--- a/sys-auth/pambase/metadata.xml
+++ b/sys-auth/pambase/metadata.xml
@@ -17,6 +17,10 @@
 			Use pam_systemd module to register user sessions in the systemd
 			control group hierarchy.
 		</flag>
+		<flag name="homed">
+			Use pam_systemd_home module to manage home directories with
+			the systemd-homed service
+		</flag>
 		<flag name="debug">
 			Enable debug information logging on syslog(3) for all the
 			modules supporting this in the system authentication and system
diff --git a/sys-auth/pambase/pambase-20210201.ebuild b/sys-auth/pambase/pambase-20210201.ebuild
new file mode 100644
index 000000000000..6a54131b47e8
--- /dev/null
+++ b/sys-auth/pambase/pambase-20210201.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit pam python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="PAM base configuration files"
+HOMEPAGE="https://github.com/gentoo/pambase"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gentoo/pambase.git"
+else
+	SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="caps debug elogind gnome-keyring homed minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd"
+
+RESTRICT="binchecks"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	?? ( passwdqc pwquality )
+	pwhistory? ( || ( passwdqc pwquality ) )
+	homed? ( !pam_krb5 )
+	pam_krb5? ( !homed )
+"
+
+MIN_PAM_REQ=1.4.0
+
+RDEPEND="
+	>=sys-libs/pam-${MIN_PAM_REQ}
+	elogind? ( sys-auth/elogind[pam] )
+	gnome-keyring? ( gnome-base/gnome-keyring[pam] )
+	mktemp? ( sys-auth/pam_mktemp )
+	pam_krb5? (
+		>=sys-libs/pam-${MIN_PAM_REQ}
+		sys-auth/pam_krb5
+	)
+	caps? ( sys-libs/libcap[pam] )
+	pam_ssh? ( sys-auth/pam_ssh )
+	passwdqc? ( >=sys-auth/passwdqc-1.4.0-r1 )
+	pwquality? ( dev-libs/libpwquality[pam] )
+	selinux? ( sys-libs/pam[selinux] )
+	sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} )
+	homed? ( sys-apps/systemd[homed] )
+	systemd? ( sys-apps/systemd[pam] )
+"
+
+BDEPEND="$(python_gen_any_dep '
+		dev-python/jinja[${PYTHON_USEDEP}]
+	')"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	${EPYTHON} ./${PN}.py \
+		$(usex caps '--caps' '') \
+		$(usex debug '--debug' '') \
+		$(usex elogind '--elogind' '') \
+		$(usex gnome-keyring '--gnome-keyring' '') \
+		$(usex homed '--homed' '') \
+		$(usex minimal '--minimal' '') \
+		$(usex mktemp '--mktemp' '') \
+		$(usex nullok '--nullok' '') \
+		$(usex pam_krb5 '--krb5' '') \
+		$(usex pam_ssh '--pam-ssh' '') \
+		$(usex passwdqc '--passwdqc' '') \
+		$(usex pwhistory '--pwhistory' '') \
+		$(usex pwquality '--pwquality' '') \
+		$(usex securetty '--securetty' '') \
+		$(usex selinux '--selinux' '') \
+		$(usex sha512 '--sha512' '') \
+		$(usex systemd '--systemd' '') \
+	|| die
+}
+
+src_test() { :; }
+
+src_install() {
+	local DOC_CONTENTS
+
+	if use passwdqc; then
+		DOC_CONTENTS="To amend the existing password policy please see the man 5 passwdqc.conf
+				page and then edit the /etc/security/passwdqc.conf file"
+	fi
+
+	if use pwquality; then
+		DOC_CONTENTS="To amend the existing password policy please see the man 5 pwquality.conf
+				page and then edit the /etc/security/pwquality.conf file"
+	fi
+
+	{ use passwdqc || use pwquality; } && readme.gentoo_create_doc
+
+	dopamd -r stack/.
+}
+
+pkg_postinst() {
+	{ use passwdqc || use pwquality; } && readme.gentoo_print_elog
+}
diff --git a/sys-auth/pambase/pambase-999999999.ebuild b/sys-auth/pambase/pambase-999999999.ebuild
index 085421e24509..e3fe00b01f59 100644
--- a/sys-auth/pambase/pambase-999999999.ebuild
+++ b/sys-auth/pambase/pambase-999999999.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
@@ -21,7 +21,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="caps debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd"
+IUSE="caps debug elogind gnome-keyring homed minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd"
 
 RESTRICT="binchecks"
 
@@ -29,6 +29,8 @@ REQUIRED_USE="
 	?? ( elogind systemd )
 	?? ( passwdqc pwquality )
 	pwhistory? ( || ( passwdqc pwquality ) )
+	homed? ( !pam_krb5 )
+	pam_krb5? ( !homed )
 "
 
 MIN_PAM_REQ=1.4.0
@@ -48,6 +50,7 @@ RDEPEND="
 	pwquality? ( dev-libs/libpwquality[pam] )
 	selinux? ( sys-libs/pam[selinux] )
 	sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} )
+	homed? ( sys-apps/systemd[homed] )
 	systemd? ( sys-apps/systemd[pam] )
 "
 
@@ -65,6 +68,7 @@ src_configure() {
 		$(usex debug '--debug' '') \
 		$(usex elogind '--elogind' '') \
 		$(usex gnome-keyring '--gnome-keyring' '') \
+		$(usex homed '--homed' '') \
 		$(usex minimal '--minimal' '') \
 		$(usex mktemp '--mktemp' '') \
 		$(usex nullok '--nullok' '') \
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 67045184c092..22374a4d6236 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 8af2c830e156..a9fcc620abab 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -3,5 +3,5 @@ AUX fio-3.20-fno-common.patch 1220 BLAKE2B dcfaac74241111cae75ebf956f34258ce883b
 DIST fio-3.19.tar.bz2 902391 BLAKE2B 84993717248add335a77c6fc03fa730f628806e1e001078d48a91bc5ac9703e42c6cc5c720cfe76a83d1daf4af2245bfd78fd6a871611de1c19562ca70a9cc89 SHA512 0004dbaf5a8ce4f2b13114a3bfb65c388bb6d01e9a82791208ff7e7eb54cd6741e60cc8cb0a19f6319301ee2040c03862725943972ea767e6cc65fce4a2b3ecb
 DIST fio-3.20.tar.bz2 912040 BLAKE2B 44f8c20a390a6382aadc07881c1e7c65cca932099a1b3992e848669cf2a52b410fde67f9ae576efcd0d8e88ceec04174b6bc077d4b3f9b615b59be9f24f62bed SHA512 4e073754c95cb8d6416a80f48ca61003f34d664717f67a3f29b554e9205f8fe3553595ba6f8a8e9cb3463022d5c83be961f5b5a1ebcd2a9f4da9406a9986c1fb
 EBUILD fio-3.19.ebuild 3892 BLAKE2B f6b3a6f22753c0ace90c7f7961dc33321b74d89cf7db26f76134c99db6dfb97f4eb1fca2f4485b30c37e71acfb52cc365f2213832c9d205e070a93d568b5c143 SHA512 3a94aaeeb38d74ccbc3d209ed72c52277bddc65755b9db1f166e80e34e60d03dc23001fd8bb6d93ed7bdb9815d1fdb5ef638402bed32c1aeda3721024e860d14
-EBUILD fio-3.20-r2.ebuild 4435 BLAKE2B e25ee6bfd4aa25d4f334434b9285b1032cc1d64cb5ea4b7ad0c510b45b04d32e7cc0b07902601b7843e9f44487719190f6fb7b65b404e38d2625d4ee07b9a109 SHA512 0a5b9874a0d5250e581f45be7268323827883fb4087e0b34028423aebd1dfeba647894847ec026ebfded67e26781117c6a1a4534fea624e247717322500a19de
+EBUILD fio-3.20-r2.ebuild 4434 BLAKE2B f95ebb55386b67e87ac213f8627ecc6dbca158dddc3a2e69e0c3ba4a6939c06db11cb99d26e7bc426fe7c23eee1abb58a9bacb87fd86dbbd3aa3b8a73edb739d SHA512 a3f48d160ff9feeb6cc6439cd59fef828b648bda35fc35352dbac9e333b62b5607e5331a83d879ad89301ba2a434efcfa12c0952a1c4ab33dfee68d715cbee15
 MISC metadata.xml 1172 BLAKE2B e35bbaaa15c8cd095791a4a23a7344314a015ea42bb864b11bb165d340585ee667f969426282465b834a7d092ab6885736e55ec8d4fe950001fbb6336fdfdc14 SHA512 defbc7f932a5ab83b67da58a601ef62784b27f2268f8a8dd5057c02fb441b164bd0945217fa52a0e06803c74b5168dda3b4668de52f593d5cade428bd2f79e86
diff --git a/sys-block/fio/fio-3.20-r2.ebuild b/sys-block/fio/fio-3.20-r2.ebuild
index 226802dbd2e3..0fd2c508cb22 100644
--- a/sys-block/fio/fio-3.20-r2.ebuild
+++ b/sys-block/fio/fio-3.20-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 x86"
 IUSE="aio curl glusterfs gnuplot gtk libressl io-uring numa python rbd rdma static tcmalloc test zbc zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	libressl? ( curl )
diff --git a/sys-block/libzbc/Manifest b/sys-block/libzbc/Manifest
index 1a87f11c0e75..232cae6fa2d8 100644
--- a/sys-block/libzbc/Manifest
+++ b/sys-block/libzbc/Manifest
@@ -1,5 +1,5 @@
 AUX libzbc-5.5.1-gcc-10.patch 2745 BLAKE2B d652144129c02bad8fa39b1587d54726e36c892b124c69084844737aa7604e16a00574569e95e6a0913f43002c4ff7240cbff017440b76842e013fdf25de6172 SHA512 d51a926e6db51df874f6cfdb73a7e85a4dd9a837fef62e6727f5e32b31fde8b9e1a2df0c06cdec0b5a9b53ab275761331566bf73f57811cbf39ebd91ee571212
 AUX libzbc-no-automagic-gtk-dep.patch 976 BLAKE2B 211a33a5eac0239526f050de30187b3392e953a257457de88c47eab39b9db518b2f9f7ea3110f6fd294ed2f54270f9a2cd25cdc38620ce7a62f2e3e68af088a6 SHA512 b1278b7d91bfabb577488016749a69714958601219a47a31794af4a22361a8f2621bdb1a964beaf78d7c73d00f934647a66e90681853abbcb5f8c7e969d981c7
 DIST libzbc-5.5.1.tar.gz 128638 BLAKE2B 3cb636f29ff29bb87c86bd800231a1b45f517822e5785af599a6385705dffa1e90574e4bd2c1b310d5a0dab094cf6e878fc80b6178ea4eb028d5d1d174e7559a SHA512 cb060d06839ea207ed2e32e940348176dd0eff2279cbdb72f565bef177eb4a195feea67c4d1ed5f455e3839475e0f4557a45774129e3d9e009ea38f9134ae159
-EBUILD libzbc-5.5.1.ebuild 805 BLAKE2B 1d1ad350a57a7a11c266c09a3c65da170f69ca3377669ef40c05055784a173efc185d135764e9ef34ea46660d1f3ba2f6c0270c1f6d2757d61719532b07846b0 SHA512 61a5692b82c7058e8c731148ee3fef7727207208d42b98bf02ab19f4e0ea43ddb7a335dc92904161adc118e031e9ca9a0fee78fdc58e55a96eaaca5b2caf9882
+EBUILD libzbc-5.5.1.ebuild 804 BLAKE2B 8909462a8bf9a3d07b2184eff23bb543bd8b66bed38ed573f01164297ecf687aaf409ccff703263e1eafa3ed4da03d04aeb3701e0a08c036141e1b2db2651943 SHA512 cb664f86d1fcd7f74a5bd1e28ce07d042e1cdeb601f8abcfda20cba8784092ac11d4e33d99922839d074be635a14b831ada0e99ad3a895d394c05834153c1b48
 MISC metadata.xml 836 BLAKE2B 360b17822ed9256339bb8a81993814aebd63925acc8b600d75851a2a1834ac6714f84f036882617f789362e06b5b58beec89e2ae5a5b01a88c67b7122311972f SHA512 6a53f78f3fb53d3ac0a97eac47710d5fcdf23db95c98f58ee1c296eef7bbbd218f79cd151eed6424a917ae69775bf2eb42916c7a51c7ac82dffd4e8e5b9ef451
diff --git a/sys-block/libzbc/libzbc-5.5.1.ebuild b/sys-block/libzbc/libzbc-5.5.1.ebuild
index db2c8c9d203a..cda85212ec9a 100644
--- a/sys-block/libzbc/libzbc-5.5.1.ebuild
+++ b/sys-block/libzbc/libzbc-5.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hgst/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="gtk"
 
 DEPEND="virtual/pkgconfig
diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index 432e217f8072..19d69d6aee95 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -7,6 +7,6 @@ DIST thin-provisioning-tools-0.9.0.tar.gz 500998 BLAKE2B ac269fb6dfd1baf1572da27
 EBUILD thin-provisioning-tools-0.7.0.ebuild 1287 BLAKE2B 0b565635eeda6a26bad5fbd6ffffe26f82cfab495d483ed41e6e7e17b6048c4fe98d07e41b5b69cb3482c5a2916f452d32edccb887a7b2bf0758f6b92829f391 SHA512 01323a16fa2e3283fdc7ea7df90e10f9f9320acdcee136d8bb754a2b4c0ea4084980417a78a389dbc1d389a7aeeeebfac482d88c4f1bae1e6ef9d0ae512504d1
 EBUILD thin-provisioning-tools-0.7.6.ebuild 1297 BLAKE2B ec8c85608bca92e5eed6d3da57c6724c83104376aaddae5ab91f3548850eb7d32db91f234ab2bfdadfac609d068e34ae8942e405d923bad5d92204d64775c79a SHA512 b0dab6fe64614b808a020e18183b3c92e7603e20529880ba3cc3e26d156b62b05e7f50421d8ef97de1f7130f625dcc25c603f655d87201f84b45c0e0e176561c
 EBUILD thin-provisioning-tools-0.8.5.ebuild 1549 BLAKE2B 06bbfbb1dec6a16af86ce1e183d86f6564237f227cf1a270aab3fd2750f3906f060e60afc34fcd650f8f4e1d474854ac5f6f449c646f4f02163d2dabcbda1366 SHA512 a01f7de103b44acf7388da317b8f00930cece3b2743ca4619fb134b69868ac077fc3a01a70d1530c8e83b1c5b9ae7710e734548e1df8b9d7e73d375e0b3b0ed5
-EBUILD thin-provisioning-tools-0.9.0.ebuild 1522 BLAKE2B af8b1fde9fa01980f243b42210e20937cf083bb7c905ad7f599f3abe2bd1f0dedc75b3a45b0ca6c004f21e14eba1fdfd53587cb2179e90cf1906b663d0f01658 SHA512 c6245f1188e10ac1eada861bd0e8e157f893ea895172543cc4a43b388ed86acb3b793f37f9a713824def9a18338a527827c74b1317a02725bc842088e295f9d9
-EBUILD thin-provisioning-tools-9999.ebuild 1522 BLAKE2B af8b1fde9fa01980f243b42210e20937cf083bb7c905ad7f599f3abe2bd1f0dedc75b3a45b0ca6c004f21e14eba1fdfd53587cb2179e90cf1906b663d0f01658 SHA512 c6245f1188e10ac1eada861bd0e8e157f893ea895172543cc4a43b388ed86acb3b793f37f9a713824def9a18338a527827c74b1317a02725bc842088e295f9d9
+EBUILD thin-provisioning-tools-0.9.0.ebuild 1542 BLAKE2B 82dfbee6061acc9c8d808d9c44cf5a091a19bd07e6eb79b3a760e530c78cae3f401f08ae5ad26282ef0eb4688eddb3195faa60be41b6d5aec8c910cc846e5468 SHA512 e351ddcf46aa976d1a757b50e612630a50889126aed7e5cbc5e5333d0e0887fec3ed0193db0804a58339dba6bb4362c7cb641371427a87ed285ddae4fcff1d56
+EBUILD thin-provisioning-tools-9999.ebuild 1542 BLAKE2B 82dfbee6061acc9c8d808d9c44cf5a091a19bd07e6eb79b3a760e530c78cae3f401f08ae5ad26282ef0eb4688eddb3195faa60be41b6d5aec8c910cc846e5468 SHA512 e351ddcf46aa976d1a757b50e612630a50889126aed7e5cbc5e5333d0e0887fec3ed0193db0804a58339dba6bb4362c7cb641371427a87ed285ddae4fcff1d56
 MISC metadata.xml 434 BLAKE2B ce8a3b7440aa5f690989729e202c836ff63833f449e5b302dd58db3b43107b698a5480d761310964ba143b665729ca6ab23417df6eda7f13f24df55427cafb7f SHA512 5a7275bd03045f680a2942a7da2685d4ad94ae1995a612e80c9b6fd4ec8530ad536592247d2e1f4162e49469b9c6139f8237de9d80cae9f339b5852042eab22d
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0.ebuild
index 65d83fdf939e..ed198255df91 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.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
@@ -22,7 +22,9 @@ IUSE="static test"
 RESTRICT="!test? ( test )"
 
 LIB_DEPEND="dev-libs/expat[static-libs(+)]
-	dev-libs/libaio[static-libs(+)]"
+	dev-libs/libaio[static-libs(+)]
+	dev-libs/boost:=[static-libs(+)]
+"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
@@ -36,7 +38,7 @@ DEPEND="${RDEPEND}
 		dev-util/cucumber
 		dev-util/aruba
 	)
-	dev-libs/boost"
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.7.0-build-fixes.patch
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
index 65d83fdf939e..ed198255df91 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.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
@@ -22,7 +22,9 @@ IUSE="static test"
 RESTRICT="!test? ( test )"
 
 LIB_DEPEND="dev-libs/expat[static-libs(+)]
-	dev-libs/libaio[static-libs(+)]"
+	dev-libs/libaio[static-libs(+)]
+	dev-libs/boost:=[static-libs(+)]
+"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
@@ -36,7 +38,7 @@ DEPEND="${RDEPEND}
 		dev-util/cucumber
 		dev-util/aruba
 	)
-	dev-libs/boost"
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.7.0-build-fixes.patch
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index dc317ba89e2b..b70146cff243 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/compsize/Manifest b/sys-fs/compsize/Manifest
index fb1fa6cd1708..5905aae5182c 100644
--- a/sys-fs/compsize/Manifest
+++ b/sys-fs/compsize/Manifest
@@ -1,4 +1,6 @@
 DIST compsize-1.3.tar.gz 14782 BLAKE2B 738ff0e2b936f5974064759914284e495c895d22d95b705e1b8fac4b3189891771b0e5be7e0eeac0883dd92f9cef276400bb7ee79840fd7db14a5269e7f78f11 SHA512 411b92651fdc3d03deccbf38f72936fee95cf80c67d6368efbc0dafacfe9793815a23ef0d02f7feadf31391e415df3d90cd19fb3acc8cce94f37cb3e4eed623d
-EBUILD compsize-1.3.ebuild 960 BLAKE2B dbfcde92a1f46173797d02234b62321341e1a21ad81948a718d79d801a8170bed6a3fc6a6d00d466023508ebe8478d8951ca93f4b6edc68c0784826f6ad6f27c SHA512 fc7f93faba100c79d64de5699bda9a189d1aaab1588933604009e1b508c3823a9daee945ea6e9c90ed07574597becea1b1186bc5bfa0857386ca807033a9b770
-EBUILD compsize-9999.ebuild 1086 BLAKE2B 99aa3fe99ee99f19ee8beb7328dc9bb1af8288111a6b8e52b0551ecc1cf818f9d2ff7e939ed88a40493e421e1afe2c56cd69a64e92bd5d788517d0ea997c31ba SHA512 4e54a226690115710a9ea85d05a77448b593e5657a9392f52570ef1f4d70770d8b7bfa5a666c6fda50270fafaba9f7009059fb8e4a30230e7e4c5c7d5d2c0259
+DIST compsize-1.4.tar.gz 15001 BLAKE2B 7e4d4a1f3ea59b23fec891c084f68ddb74838320a817767e48eb857de9678a1915d304d25b454afafec867ea6a028d99d9182087d3229ddae55d8305fe6b174c SHA512 c07081721f87d8a59e724a62a0a6d6724434292e6bb3ffb71acd7c47e21727db8f02f4df296cb6094c0e80d3cd555018e492616747ce69055d21302a6617ca54
+EBUILD compsize-1.3.ebuild 966 BLAKE2B 190fe583af11b73cebc53de403e6db93b227640d211501ad7f0320c47684cb1ccc9e4fcce6248eac7ceebdb8bc188e1f518e15091c71acc2d64489eb75ecde35 SHA512 0e8e2cb492d64db2192e7eeeece71628e9395bbe30bfed2530ce9b7411dd12033f88ffd5260f1a0b0c40d7d7f35137c50b68ec7017eae528b353e9e11251ade7
+EBUILD compsize-1.4.ebuild 878 BLAKE2B 3564d9e3bedc4bdd95294e1ec12baf423a6bde645a3d03e53f6bd6f547742459845265bff9d7570c050f7f52f80cc1e9e78d8054b0a265d817706ddb9cf33c31 SHA512 abd05d452e141457a48967404570dac752100ca835df1851370602402991246cbee58a73ef3e2c79b2ba4ba4cdf5202f70fdad27ef0d8e28a31c69404189d366
+EBUILD compsize-9999.ebuild 878 BLAKE2B 3564d9e3bedc4bdd95294e1ec12baf423a6bde645a3d03e53f6bd6f547742459845265bff9d7570c050f7f52f80cc1e9e78d8054b0a265d817706ddb9cf33c31 SHA512 abd05d452e141457a48967404570dac752100ca835df1851370602402991246cbee58a73ef3e2c79b2ba4ba4cdf5202f70fdad27ef0d8e28a31c69404189d366
 MISC metadata.xml 444 BLAKE2B 0eacf312059aaec47fa5f5036bc09afccf3275819b8e2890a02130d9e142020945f68d3e155cee27e18d6c061ddbbd6de71231beeab8a4b29e5535ad84db308c SHA512 1c03b76ef3eae52b3212d7f1a8b2e822ac24dcad2a95ed078d4819a7084e6e701f76ce3c17e38efaaeaede24357126cbf54e311c6b2a5c26e75299971ac7649e
diff --git a/sys-fs/compsize/compsize-1.3.ebuild b/sys-fs/compsize/compsize-1.3.ebuild
index bf8f1d40bf84..fc78e5b437fd 100644
--- a/sys-fs/compsize/compsize-1.3.ebuild
+++ b/sys-fs/compsize/compsize-1.3.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
@@ -16,7 +16,7 @@ else
 	KEYWORDS="amd64 x86"
 fi
 
-LICENSE="GPL-2+"
+LICENSE="GPL-2+ GPL-2"
 IUSE="debug"
 SLOT="0"
 
diff --git a/sys-fs/compsize/compsize-1.4.ebuild b/sys-fs/compsize/compsize-1.4.ebuild
new file mode 100644
index 000000000000..f00e46619d53
--- /dev/null
+++ b/sys-fs/compsize/compsize-1.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Utility to find btrfs compression type/ratio on a file or set of files"
+HOMEPAGE="https://github.com/kilobyte/compsize"
+
+if [[ ${PV} = 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kilobyte/compsize.git"
+else
+	SRC_URI="https://github.com/kilobyte/compsize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ GPL-2"
+IUSE="debug"
+SLOT="0"
+
+DEPEND="sys-fs/btrfs-progs"
+
+src_prepare() {
+	default
+	# Don't try to install a gzipped manfile during emake install
+	sed -i -e $'s/\.gz//' -e $'s/gzip.*/install \-Dm755 \$\< \$\@/' Makefile || die
+}
+
+src_configure() {
+	use debug && append-cflags -Wall -DDEBUG -g
+	default
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" install
+	einstalldocs
+}
diff --git a/sys-fs/compsize/compsize-9999.ebuild b/sys-fs/compsize/compsize-9999.ebuild
index 3144e142c1e2..f00e46619d53 100644
--- a/sys-fs/compsize/compsize-9999.ebuild
+++ b/sys-fs/compsize/compsize-9999.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
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="GPL-2+"
+LICENSE="GPL-2+ GPL-2"
 IUSE="debug"
 SLOT="0"
 
@@ -26,18 +26,14 @@ src_prepare() {
 	default
 	# Don't try to install a gzipped manfile during emake install
 	sed -i -e $'s/\.gz//' -e $'s/gzip.*/install \-Dm755 \$\< \$\@/' Makefile || die
-	# sys-fs/compsize > 1.3 removes '/usr' from install paths in Makefile
-	sed -i $'s/(PREFIX)/(PREFIX)\/usr/' Makefile || die
 }
 
 src_configure() {
-	# Used in upstream Makefile, but clobbered by portage's CFLAGS
-	append-cflags -Wall -std=gnu90
-	use debug && append-cflags -DDEBUG -g
+	use debug && append-cflags -Wall -DDEBUG -g
 	default
 }
 
 src_install() {
-	emake PREFIX="${D}" install
-	dodoc "README.md"
+	emake PREFIX="${ED}/usr" install
+	einstalldocs
 }
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 1730df73cf97..5b9137cc16f6 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 4898002db74e..3b4ce0c200d6 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -4,9 +4,11 @@ DIST patch-5.11-rc2.patch 74560270 BLAKE2B 1e4ac4ce26e20aa6b48c88af114f6303c6d89
 DIST patch-5.11-rc3.patch 75045235 BLAKE2B d159e9e4bedcf6838e0b81462b53445955e59edd266e25cd001d163af36ad56de06dae5496e14663db860805825402959189ce15a80bdb561134d78ff5616b5d SHA512 5fd19e81144ebf489d5a6833b95a21f94c8b0f8d66e85d1c94acdeba008f8705367e03c411c80a61c4c0df30ddfbadcb65ba835014dad6e79c130b756fe518df
 DIST patch-5.11-rc4.patch 75392493 BLAKE2B efc6b837641883d1ed7e165d5ba08a36ec85c3bfce49f4f8a0ed09d39df6ecf5844908c13a0bd2792c3dd2a57073dae211934f681482d3a04c0a3589a0776f68 SHA512 072cca3d9bc343b791278258102186646fb46f4808680c71cbe55ba3574448711aaa85b34e8f664a354d69d1665759c196ed37e23f1c0285851b0d2538ff173d
 DIST patch-5.11-rc5.patch 75678864 BLAKE2B 8f8afe6935e2d9616981a87c753cc517772f9b0e29d027518fda903f2bd068b0c376ccd668bab489b155875589962211a430880d44945d1faa6d53bd06b5deb2 SHA512 7665e1bd8c58567af774a85065c28a8ded29520eaca4b6ff367ab99a6ce26091e1097949baf23455b5d20e04b9214410dea3d3812b81e91701f6eb40a6d52df8
+DIST patch-5.11-rc6.patch 75970283 BLAKE2B b19ab87b876e41d1efb64d7d542e5493765843fae37a8a9fd1a0e8e4f74a59925a576ad0319dd5ca9133d4a5c6a6080a0e65100dd253b6236dd9b50dbcf2c7e1 SHA512 7096fd281ce60fff3b03244d87fbef06c3b684e95162d19093abcaeb6eb6e0a10e47035f093be90d5760d5dedfcd7a95ccb4009118a7fbc2518ced6aee1a1158
 EBUILD git-sources-5.11_rc1.ebuild 1172 BLAKE2B 48bbfc3905cd0a76124843ce8ca422b16bd252790287568e9afc48ad455c192ea151a07f3ac101d940ab1fc95867c6d6e7910959f1338d27c25bec6584c13331 SHA512 874055e06039c4c23bb3ae53f46f4f0aea6c9194aa0e644eee665d83650cbd368b067319d7d5740c6b0bb2edc7b5bf6563db5df67ff0ee2df7b52a3ab0cf50cd
 EBUILD git-sources-5.11_rc2.ebuild 1172 BLAKE2B 34a6e1badae0929f0bbbdb08c099ef771f2809be9861db6ca2b0d65644676e25f9fbea9f9e6cbd77cb2a9487c56d7ebd87eca23e96e473e03834c2b7989482c7 SHA512 cb0fa03c6bd14d93e0662349ee5d5f339ac46d622a63544f3b46313759d52fc2bfdf761680ca3c2d19ad2fbb72905e504ea79a61f99eb381c95309e67aceb773
 EBUILD git-sources-5.11_rc3.ebuild 1172 BLAKE2B 34a6e1badae0929f0bbbdb08c099ef771f2809be9861db6ca2b0d65644676e25f9fbea9f9e6cbd77cb2a9487c56d7ebd87eca23e96e473e03834c2b7989482c7 SHA512 cb0fa03c6bd14d93e0662349ee5d5f339ac46d622a63544f3b46313759d52fc2bfdf761680ca3c2d19ad2fbb72905e504ea79a61f99eb381c95309e67aceb773
 EBUILD git-sources-5.11_rc4.ebuild 1172 BLAKE2B 34a6e1badae0929f0bbbdb08c099ef771f2809be9861db6ca2b0d65644676e25f9fbea9f9e6cbd77cb2a9487c56d7ebd87eca23e96e473e03834c2b7989482c7 SHA512 cb0fa03c6bd14d93e0662349ee5d5f339ac46d622a63544f3b46313759d52fc2bfdf761680ca3c2d19ad2fbb72905e504ea79a61f99eb381c95309e67aceb773
 EBUILD git-sources-5.11_rc5.ebuild 1172 BLAKE2B 34a6e1badae0929f0bbbdb08c099ef771f2809be9861db6ca2b0d65644676e25f9fbea9f9e6cbd77cb2a9487c56d7ebd87eca23e96e473e03834c2b7989482c7 SHA512 cb0fa03c6bd14d93e0662349ee5d5f339ac46d622a63544f3b46313759d52fc2bfdf761680ca3c2d19ad2fbb72905e504ea79a61f99eb381c95309e67aceb773
+EBUILD git-sources-5.11_rc6.ebuild 1172 BLAKE2B 34a6e1badae0929f0bbbdb08c099ef771f2809be9861db6ca2b0d65644676e25f9fbea9f9e6cbd77cb2a9487c56d7ebd87eca23e96e473e03834c2b7989482c7 SHA512 cb0fa03c6bd14d93e0662349ee5d5f339ac46d622a63544f3b46313759d52fc2bfdf761680ca3c2d19ad2fbb72905e504ea79a61f99eb381c95309e67aceb773
 MISC metadata.xml 464 BLAKE2B 37fa8f89a0431479faf733cd072c8d86fe27976913e47a9e09d6028e2eec20bd9b3093da14a2f01f00ff88ee6da012eb1dad96a9b3f5bc04f82157e9715c2645 SHA512 56e60b220ade75cd0b4175c43f01e8e31eb088c563327a25c0875493bbe28b5cef80fefb2b5394eb749c2eee43a1cbb632bdc79d48435e6a2f0fe609b13a2dfe
diff --git a/sys-kernel/git-sources/git-sources-5.11_rc6.ebuild b/sys-kernel/git-sources/git-sources-5.11_rc6.ebuild
new file mode 100644
index 000000000000..d3797acbcee8
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.11_rc6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="5.10"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 6a75d89616cb..dd00de2acb28 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 7a5f3883d996..6f866a0e6573 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -26,6 +26,8 @@ DIST glibc-2.32-patches-4.tar.xz 49884 BLAKE2B e7f364123d9c7b6be5f769a5be0c71afe
 DIST glibc-2.32-patches-5.tar.xz 53116 BLAKE2B b2bd9d2cc7fb8f7d3cd96d8439842c30aeed4703e69f959a470967d82dc37ce141f747387c793a3ee6663ed8889af1bcca87fd9ca66c51f1099bba36fe6759d5 SHA512 b3b2baf7b25e28cd4884c4d61f1337b3e49c39dc3f6d789e7cb0a1e180402028da9e8a69828940d2e9676a857d6248da1173d45e8465adca4e148bc2bd76cb62
 DIST glibc-2.32-patches-6.tar.xz 54552 BLAKE2B 3c14b7849f53a3c9132c50c4ddcf6cfe42eabfabdfab21231bc1834e030ace88cc2121e4e1e8e74d9137e5b0692b5aca8b62762437317dc57665a1ea63d05014 SHA512 0e03891d992b211ffc5ef21d604f9f8a0adc783af46eea5a81c28024ff13f793dd236f83652eec19308645c9dd68c6017c64626f14edf30fdaeccd65af2167b7
 DIST glibc-2.32.tar.xz 16744512 BLAKE2B a56b4afbb35315c5cd6dca0f62e44455dceae3e6e88a8453621f9a5394a60ddf10ca9309b2db0911830c7fd77e3faa5d94694eb94d5b2c05fc5285cef52255da SHA512 8460c155b7003e04f18dabece4ed9ad77445fa2288a7dc08e80a8fc4c418828af29e0649951bd71a54ea2ad2d4da7570aafd9bdfe4a37e9951b772b442afe50b
+DIST glibc-2.33-patches-1.tar.xz 7636 BLAKE2B 8a72d091e506efd0b122ac0822544c7d3b323761f69cd874392abe0d059c58f784b13d9d1b4ab32f8b70118ac8b47dc074cc80349b316f8f4304b894093c3918 SHA512 b9a49adf781fef800618fe8e08a026f5c2a7470c1ac121aabc516d8a4a4c5dd48e90bf7558ebef22656904892e9f9515e57430c68427326da9b5938ea64df871
+DIST glibc-2.33.tar.xz 17031280 BLAKE2B 703d12121c1e2c5d9e0c6ba5341f5fb5c4d9111611a83f2360029b5de9c6e5a5611249d1833684a58ed4afdf49cae614365d87ec8721ba0e5d218f593b1f229d SHA512 4cb5777b68b22b746cc51669e0e9282b43c83f6944e42656e6db7195ebb68f2f9260f130fdeb4e3cfc64efae4f58d96c43d388f52be1eb024ca448084684abdb
 DIST locale-gen-2.00.tar.gz 7738 BLAKE2B cde6de5ba3400aea24d0d5f1b79471f89f09fb747c8e371e38316c7ada92f967e0865f573f23cb353d82419c234724143c0aeca9eb70eb945dfc581cc7491eb1 SHA512 b609fddb9ec5e567c008841fef3390eddb5d6e7699a8271b3b8c0ade1b44b0ac2e5d1daa8b9acabf3432e3b88110b538a96f209b1ad0f9e988b7efce66606dff
 DIST locale-gen-2.10.tar.gz 7747 BLAKE2B 49f569c5ae5260fca128503bc6f22d6f6f1cda817920c41fdadadf1527bbb4f3eb161f79fa729830666a4673e9092f99f4685ec8fcac8ddea0b8242bca9c1f4f SHA512 e350e60d458d67638e3090711fca05af6fafac06c51b97648244549f8a0621dab7543f09dc7ad4c62392f13bdae8e5875dc6d0b6c3d83efc29d116bc2eef92db
 EBUILD glibc-2.19-r2.ebuild 38315 BLAKE2B 6002933b094b0606e06a3f749cecdd9bae79ad3c08ef3ad35a2b5b1e4250b7c40f8454802bd98f634439f73f26c4561a909f7dca4ea2558ea5bb815034c4986a SHA512 fa5193a014bccd29eb0b641de634a43af0d8517a7dfde591b5eeb5e73d6ccb2a8b16ee4db09594db60a0a959da2c33f9d480be6f6e050bbc3d54507101089124
@@ -39,5 +41,6 @@ EBUILD glibc-2.32-r3.ebuild 44714 BLAKE2B 795b2d5d5c57d5c98791ce9bc4e45cb69b74fa
 EBUILD glibc-2.32-r5.ebuild 44714 BLAKE2B 63f8695808d81b723d3a8c0fbdfbd72c95ac0c4c56aea2f3df3c4497983cbf2e6dee493d652b4d24e90447b39dea1b9e949cd4e2c981270ee08344576a16f287 SHA512 e11e83b9f1f7b293c99457794ae43d37c20aefd6129ce4b4588b744340745e31df00e4f9d2df6e87279d40507aabea19a591e767319f2a81814f37869c4e9bb0
 EBUILD glibc-2.32-r6.ebuild 44717 BLAKE2B 4d523144781b216e9819b5af0c485991017b82203f02a6bee7f91512d326d7cee750bf08a25ae45aed78abffb44dc4841fd01a33f9f0a13dd0ff2bebd4c8a4ef SHA512 abb333315b6c0dfc9c7dd4adeba97f3d387a6c35fb4e4ce93ad611894fab35d709dfef52988227e3a42fc5444037dad5f9beab1959653d20b196ec278f95e23e
 EBUILD glibc-2.32-r7.ebuild 44723 BLAKE2B 64978fd8452bac9bb3d649a819ad6142115f6976e03ff83c60e6d20ad69c2a8ab5f26f2d3df85f492d702e475a2498a6ec54cef42ae77ce6c07cd0f9879530ad SHA512 d66f2507e029bfa467618e2ce6c7050ef66a2e15be09eb79ce5ac746a6b3fdfea5b042ea30ddd6abdb3efc67dd2ce443c08053823214538770bcc9cfbf226486
+EBUILD glibc-2.33.ebuild 44212 BLAKE2B 9c8b4c9d615cdadff846a33bbeb33b884d0b47866127676caa7d07b5c1a8d4b9ac5a4f8ae50724f9ac04c237936f20606c173d7b06c7a9f3540bcefc05e773ba SHA512 08b857fa6813efc9d6d555cb7dcbb735c792f53c792a4673755c9487715e9025e048b85378c02994617ca4f6c9d288918493fcd4e7ef412161dbfcb8eb0b5b9d
 EBUILD glibc-9999.ebuild 44210 BLAKE2B 09c750fd741b4c4ccb50c4d2c5902ce5fc86637eaeb8d4fc61e741fb06e520c04a578c2d1d118e5966b7ce5ffdb065657043ca836858df7c31e20663aa9ed3db SHA512 991a9b489278ba644a639a592067fd54acf213c50abc64e0dcf8d46ff7f5fc98cf436cb8518af5be2260db4c281226a35b3af4825e2379644adda581e36c3e03
 MISC metadata.xml 1611 BLAKE2B 3bd777c160ea20cdbd86cca791d9fd4ff02f8d100344235ec74fff37d5cae1e7119e0ec26969707e75a983dcdb23e994559c8be128ef40fa0ec9ed655017466d SHA512 08be6d085ac47b140fff17a3be8cee77e066a4536cdce76fa44c77875dec2a9dc236ff67ff44301abf75cb196d1902feb2a139dda420220248b46dd9cdb16b9f
diff --git a/sys-libs/glibc/glibc-2.33.ebuild b/sys-libs/glibc/glibc-2.33.ebuild
new file mode 100644
index 000000000000..ee67def4831d
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.33.ebuild
@@ -0,0 +1,1498 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig \
+	multilib systemd multiprocessing
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/"
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+SLOT="2.2"
+
+EMULTILIB_PKG="true"
+
+# Gentoo patchset (ignored for live ebuilds)
+PATCH_VER=1
+PATCH_DEV=dilfridge
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+else
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS=""
+	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
+fi
+
+RELEASE_VER=${PV}
+
+GCC_BOOTSTRAP_VER=20201208
+
+LOCALE_GEN_VER=2.10
+
+SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz"
+SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
+
+IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla"
+
+# Minimum kernel version that glibc requires
+MIN_KERN_VER="3.2.0"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+#
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+# Note [Disable automatic stripping]
+# Disabling automatic stripping for a few reasons:
+# - portage's attempt to strip breaks non-native binaries at least on
+#   arm: bug #697428
+# - portage's attempt to strip libpthread.so.0 breaks gdb thread
+#   enumeration: bug #697910. This is quite subtle:
+#   * gdb uses glibc's libthread_db-1.0.so to enumerate threads.
+#   * libthread_db-1.0.so needs access to libpthread.so.0 local symbols
+#     via 'ps_pglobal_lookup' symbol defined in gdb.
+#   * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all
+#     known symbols in 'libpthread.so.0'. Specifically 'nptl_version'
+#     (unexported) is used to sanity check compatibility before enabling
+#     debugging.
+#     Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint
+#   * normal 'strip' command trims '.symtab'
+#   Thus our main goal here is to prevent 'libpthread.so.0' from
+#   losing it's '.symtab' entries.
+# As Gentoo's strip does not allow us to pass less aggressive stripping
+# options and does not check the machine target we strip selectively.
+
+# We need a new-enough binutils/gcc to match upstream baseline.
+# Also we need to make sure our binutils/gcc supports TLS,
+# and that gcc already contains the hardened patches.
+# Lastly, let's avoid some openssh nastiness, bug 708224, as
+# convenience to our users.
+
+# gzip, grep, awk are needed by locale-gen, bug 740750
+
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-misc/pax-utils-0.1.10
+	sys-devel/bison
+	doc? ( sys-apps/texinfo )
+	!compile-locales? (
+		app-arch/gzip
+		sys-apps/grep
+		virtual/awk
+	)
+"
+COMMON_DEPEND="
+	gd? ( media-libs/gd:2= )
+	nscd? ( selinux? (
+		audit? ( sys-process/audit )
+		caps? ( sys-libs/libcap )
+	) )
+	suid? ( caps? ( sys-libs/libcap ) )
+	selinux? ( sys-libs/libselinux )
+	systemtap? ( dev-util/systemtap )
+	!<net-misc/openssh-8.1_p1-r2
+"
+DEPEND="${COMMON_DEPEND}
+	compile-locales? (
+		app-arch/gzip
+		sys-apps/grep
+		virtual/awk
+	)
+	test? ( >=net-dns/libidn2-2.3.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-arch/gzip
+	sys-apps/grep
+	virtual/awk
+	sys-apps/gentoo-functions
+"
+
+RESTRICT="!test? ( test )"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	BDEPEND+=" !headers-only? (
+		>=${CATEGORY}/binutils-2.27
+		>=${CATEGORY}/gcc-6
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	BDEPEND+="
+		>=sys-devel/binutils-2.27
+		>=sys-devel/gcc-6
+	"
+	DEPEND+=" virtual/os-headers "
+	RDEPEND+="
+		>=net-dns/libidn2-2.3.0
+		vanilla? ( !sys-libs/timezone-data )
+	"
+	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+# Ignore tests whitelisted below
+GENTOO_GLIBC_XFAIL_TESTS="${GENTOO_GLIBC_XFAIL_TESTS:-yes}"
+
+# The following tests fail due to the Gentoo build system and are thus
+# executed but ignored:
+XFAIL_TEST_LIST=(
+	# 9) Failures of unknown origin
+	tst-latepthread
+
+	# buggy test, assumes /dev/ and /dev/null on a single filesystem
+	# 'mount --bind /dev/null /chroot/dev/null' breaks it.
+	# https://sourceware.org/PR25909
+	tst-support_descriptors
+
+	# Flaky test, known to fail occasionally:
+	# https://sourceware.org/PR19329
+	# https://bugs.gentoo.org/719674#c12
+	tst-stack4
+)
+
+#
+# Small helper functions
+#
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	is_crosscompile && use headers-only
+}
+
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+
+# This prefix is applicable to CHOST when building against this
+# glibc. It is baked into the library at configure time.
+host_eprefix() {
+	is_crosscompile || echo "${EPREFIX}"
+}
+
+# This prefix is applicable to CBUILD when building against this
+# glibc. It determines the destination path at install time.
+build_eprefix() {
+	is_crosscompile && echo "${EPREFIX}"
+}
+
+# We need to be able to set alternative headers for compiling for non-native
+# platform. Will also become useful for testing kernel-headers without screwing
+# up the whole system.
+alt_headers() {
+	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
+}
+
+alt_build_headers() {
+	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
+		ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)"
+		if tc-is-cross-compiler ; then
+			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
+			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
+				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
+				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
+			fi
+		fi
+	fi
+	echo "${ALT_BUILD_HEADERS}"
+}
+
+alt_libdir() {
+	echo $(alt_prefix)/$(get_libdir)
+}
+alt_usrlibdir() {
+	echo $(alt_prefix)/usr/$(get_libdir)
+}
+
+builddir() {
+	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+}
+
+do_compile_test() {
+	local ret save_cflags=${CFLAGS}
+	CFLAGS+=" $1"
+	shift
+
+	pushd "${T}" >/dev/null
+
+	rm -f glibc-test*
+	printf '%b' "$*" > glibc-test.c
+
+	# Most of the time CC is already set, but not in early sanity checks.
+	nonfatal emake glibc-test CC="${CC-$(tc-getCC ${CTARGET})}"
+	ret=$?
+
+	popd >/dev/null
+
+	CFLAGS=${save_cflags}
+	return ${ret}
+}
+
+do_run_test() {
+	local ret
+
+	if [[ ${MERGE_TYPE} == "binary" ]] ; then
+		# ignore build failures when installing a binary package #324685
+		do_compile_test "" "$@" 2>/dev/null || return 0
+	else
+		if ! do_compile_test "" "$@" ; then
+			ewarn "Simple build failed ... assuming this is desired #324685"
+			return 0
+		fi
+	fi
+
+	pushd "${T}" >/dev/null
+
+	./glibc-test
+	ret=$?
+	rm -f glibc-test*
+
+	popd >/dev/null
+
+	return ${ret}
+}
+
+setup_target_flags() {
+	# This largely mucks with compiler flags.  None of which should matter
+	# when building up just the headers.
+	just_headers && return 0
+
+	case $(tc-arch) in
+		x86)
+			# -march needed for #185404 #199334
+			# TODO: When creating the first glibc cross-compile, this test will
+			# always fail as it does a full link which in turn requires glibc.
+			# Probably also applies when changing multilib profile settings (e.g.
+			# enabling x86 when the profile was amd64-only previously).
+			# We could change main to _start and pass -nostdlib here so that we
+			# only test the gcc code compilation.  Or we could do a compile and
+			# then look for the symbol via scanelf.
+			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				filter-flags '-march=*'
+				export CFLAGS="-march=${t} ${CFLAGS}"
+				einfo "Auto adding -march=${t} to CFLAGS #185404"
+			fi
+		;;
+		amd64)
+			# -march needed for #185404 #199334
+			# TODO: See cross-compile issues listed above for x86.
+			[[ ${ABI} == x86 ]] &&
+			if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				# Normally the target is x86_64-xxx, so turn that into the -march that
+				# gcc actually accepts. #528708
+				[[ ${t} == "x86_64" ]] && t="x86-64"
+				filter-flags '-march=*'
+				# ugly, ugly, ugly.  ugly.
+				CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
+				export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
+				einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
+			fi
+		;;
+		mips)
+			# The mips abi cannot support the GNU style hashes. #233233
+			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
+		;;
+		ppc|ppc64)
+			# Many arch-specific implementations do not work on ppc with
+			# cache-block not equal to 128 bytes. This breaks memset:
+			#   https://sourceware.org/PR26522
+			#   https://bugs.gentoo.org/737996
+			# Use default -mcpu=. For ppc it means non-multiarch setup.
+			filter-flags '-mcpu=*'
+		;;
+		sparc)
+			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
+			filter-flags "-fcall-used-g7"
+			append-flags "-fcall-used-g6"
+
+			local cpu
+			case ${CTARGET} in
+			sparc64-*)
+				cpu="sparc64"
+				case $(get-flag mcpu) in
+				v9)
+					# We need to force at least v9a because the base build doesn't
+					# work with just v9.
+					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
+					append-flags "-Wa,-xarch=v9a"
+					;;
+				esac
+				;;
+			sparc-*)
+				case $(get-flag mcpu) in
+				v8|supersparc|hypersparc|leon|leon3)
+					cpu="sparcv8"
+					;;
+				*)
+					cpu="sparcv9"
+					;;
+				esac
+			;;
+			esac
+			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
+		;;
+	esac
+}
+
+setup_flags() {
+	# Make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+
+	# Store our CFLAGS because it's changed depending on which CTARGET
+	# we are building when pulling glibc on a multilib profile
+	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+	CFLAGS=${CFLAGS_BASE}
+	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
+	CXXFLAGS=${CXXFLAGS_BASE}
+	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+	ASFLAGS=${ASFLAGS_BASE}
+
+	# Allow users to explicitly avoid flag sanitization via
+	# USE=custom-cflags.
+	if ! use custom-cflags; then
+		# Over-zealous CFLAGS can often cause problems.  What may work for one
+		# person may not work for another.  To avoid a large influx of bugs
+		# relating to failed builds, we strip most CFLAGS out to ensure as few
+		# problems as possible.
+		strip-flags
+		# Lock glibc at -O2; we want to be conservative here.
+		filter-flags '-O?'
+		append-flags -O2
+	fi
+	strip-unsupported-flags
+	filter-flags -m32 -m64 '-mabi=*'
+
+	# glibc aborts if rpath is set by LDFLAGS
+	filter-ldflags '-Wl,-rpath=*'
+
+	# #492892
+	filter-flags -frecord-gcc-switches
+
+	unset CBUILD_OPT CTARGET_OPT
+	if use multilib ; then
+		CTARGET_OPT=$(get_abi_CTARGET)
+		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+	fi
+
+	setup_target_flags
+
+	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
+		CBUILD_OPT=${CTARGET_OPT}
+	fi
+
+	# glibc's headers disallow -O0 and fail at build time:
+	#  include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization"
+	replace-flags -O0 -O1
+
+	filter-flags '-fstack-protector*'
+}
+
+want_tls() {
+	# Archs that can use TLS (Thread Local Storage)
+	case $(tc-arch) in
+		x86)
+			# requires i486 or better #106556
+			[[ ${CTARGET} == i[4567]86* ]] && return 0
+			return 1
+		;;
+	esac
+	return 0
+}
+
+want__thread() {
+	want_tls || return 1
+
+	# For some reason --with-tls --with__thread is causing segfaults on sparc32.
+	[[ ${PROFILE_ARCH} == "sparc" ]] && return 1
+
+	[[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
+
+	# only test gcc -- can't test linking yet
+	tc-has-tls -c ${CTARGET}
+	WANT__THREAD=$?
+
+	return ${WANT__THREAD}
+}
+
+use_multiarch() {
+	# Allow user to disable runtime arch detection in multilib.
+	use multiarch || return 1
+	# Make sure binutils is new enough to support indirect functions,
+	# #336792. This funky sed supports gold and bfd linkers.
+	local bver nver
+	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
+	case $(tc-arch ${CTARGET}) in
+	amd64|x86) nver="2.20" ;;
+	arm)       nver="2.22" ;;
+	hppa)      nver="2.23" ;;
+	ppc|ppc64) nver="2.20" ;;
+	# ifunc support was added in 2.23, but glibc also needs
+	# machinemode which is in 2.24.
+	s390)      nver="2.24" ;;
+	sparc)     nver="2.21" ;;
+	*)         return 1 ;;
+	esac
+	ver_test ${bver} -ge ${nver}
+}
+
+# Setup toolchain variables that had historically been defined in the
+# profiles for these archs.
+setup_env() {
+	# silly users
+	unset LD_RUN_PATH
+	unset LD_ASSUME_KERNEL
+
+	if is_crosscompile || tc-is-cross-compiler ; then
+		multilib_env ${CTARGET_OPT:-${CTARGET}}
+
+		if ! use multilib ; then
+			MULTILIB_ABIS=${DEFAULT_ABI}
+		else
+			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+		fi
+
+		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
+		# and fall back on CFLAGS.
+		local VAR=CFLAGS_${CTARGET//[-.]/_}
+		CFLAGS=${!VAR-${CFLAGS}}
+		einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
+	fi
+
+	setup_flags
+
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+	if just_headers ; then
+		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
+		# At this bootstrap stage we have only binutils for
+		# target but not compiler yet.
+		einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
+		return 0
+	fi
+	local VAR=CFLAGS_${ABI}
+	# We need to export CFLAGS with abi information in them because glibc's
+	# configure script checks CFLAGS for some targets (like mips).  Keep
+	# around the original clean value to avoid appending multiple ABIs on
+	# top of each other.
+	: ${__GLIBC_CC:=$(tc-getCC ${CTARGET})}
+	export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+}
+
+foreach_abi() {
+	setup_env
+
+	local ret=0
+	local abilist=""
+	if use multilib ; then
+		abilist=$(get_install_abis)
+	else
+		abilist=${DEFAULT_ABI}
+	fi
+	local -x ABI
+	for ABI in ${abilist:-default} ; do
+		setup_env
+		einfo "Running $1 for ABI ${ABI}"
+		$1
+		: $(( ret |= $? ))
+	done
+	return ${ret}
+}
+
+glibc_banner() {
+	local b="Gentoo ${PVR}"
+	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
+	echo "${b}"
+}
+
+# The following Kernel version handling functions are mostly copied from portage
+# source. It's better not to use linux-info.eclass here since a) it adds too
+# much magic, see bug 326693 for some of the arguments, and b) some of the
+# functions are just not provided.
+
+g_get_running_KV() {
+	uname -r
+	return $?
+}
+
+g_KV_major() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	echo "${KV%%.*}"
+}
+
+g_KV_minor() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.}
+	echo "${KV%%.*}"
+}
+
+g_KV_micro() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.*.}
+	echo "${KV%%[^[:digit:]]*}"
+}
+
+g_KV_to_int() {
+	[[ -z $1 ]] && return 1
+	local KV_MAJOR=$(g_KV_major "$1")
+	local KV_MINOR=$(g_KV_minor "$1")
+	local KV_MICRO=$(g_KV_micro "$1")
+	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
+
+	# We make version 2.2.0 the minimum version we will handle as
+	# a sanity check ... if its less, we fail ...
+	if [[ ${KV_int} -ge 131584 ]] ; then
+		echo "${KV_int}"
+		return 0
+	fi
+	return 1
+}
+
+g_int_to_KV() {
+	local version=$1 major minor micro
+	major=$((version / 65536))
+	minor=$(((version % 65536) / 256))
+	micro=$((version % 256))
+	echo ${major}.${minor}.${micro}
+}
+
+eend_KV() {
+	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
+	eend $?
+}
+
+get_kheader_version() {
+	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
+	$(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \
+	tail -n 1
+}
+
+# We collect all sanity checks here. Consistency is not guranteed between
+# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
+# src_unpack.
+sanity_prechecks() {
+	# Prevent native builds from downgrading
+	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
+	   [[ -z ${ROOT} ]] && \
+	   [[ ${CBUILD} == ${CHOST} ]] && \
+	   [[ ${CHOST} == ${CTARGET} ]] ; then
+
+		# The high rev # is to allow people to downgrade between -r#
+		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
+		# should be fine. Hopefully we never actually use a r# this
+		# high.
+		if has_version ">${CATEGORY}/${P}-r10000" ; then
+			eerror "Sanity check to keep you from breaking your system:"
+			eerror " Downgrading glibc is not supported and a sure way to destruction."
+			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
+		fi
+
+		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
+			eerror "Your old kernel is broken. You need to update it to a newer"
+			eerror "version as syscall(<bignum>) will break. See bug 279260."
+			die "Old and broken kernel."
+		fi
+	fi
+
+	# Users have had a chance to phase themselves, time to give em the boot
+	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
+		eerror "You still haven't deleted ${EROOT}/etc/locales.build."
+		eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
+		die "Lazy upgrader detected"
+	fi
+
+	if [[ ${CTARGET} == i386-* ]] ; then
+		eerror "i386 CHOSTs are no longer supported."
+		eerror "Chances are you don't actually want/need i386."
+		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
+		die "Please fix your CHOST"
+	fi
+
+	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
+		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
+		ewarn "This will result in a 50% performance penalty when running with a 32bit"
+		ewarn "hypervisor, which is probably not what you want."
+	fi
+
+	# Check for sanity of /etc/nsswitch.conf
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] ; then
+		local entry
+		for entry in passwd group shadow; do
+			if ! egrep -q "^[ \t]*${entry}:.*files" "${EROOT}"/etc/nsswitch.conf; then
+				eerror "Your ${EROOT}/etc/nsswitch.conf is out of date."
+				eerror "Please make sure you have 'files' entries for"
+				eerror "'passwd:', 'group:' and 'shadow:' databases."
+				eerror "For more details see:"
+				eerror "  https://wiki.gentoo.org/wiki/Project:Toolchain/nsswitch.conf_in_glibc-2.26"
+				die "nsswitch.conf has no 'files' provider in '${entry}'."
+			fi
+		done
+	fi
+
+	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
+	# we test for...
+	if ! is_crosscompile ; then
+		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
+			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
+			local STAT
+			if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
+				"${T}/check-ia32-emulation.elf32"
+				STAT=$?
+			else
+				# Don't fail here to allow single->multi ABI switch
+				# or recover from breakage like bug #646424
+				ewarn "Failed to compile the ABI test. Broken host glibc?"
+				STAT=0
+			fi
+			rm -f "${T}/check-ia32-emulation.elf32"
+			eend $STAT
+			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+		fi
+
+	fi
+
+	# When we actually have to compile something...
+	if ! just_headers ; then
+		ebegin "Checking gcc for __thread support"
+		if ! eend $(want__thread ; echo $?) ; then
+			echo
+			eerror "Could not find a gcc that supports the __thread directive!"
+			eerror "Please update your binutils/gcc and try again."
+			die "No __thread support in gcc!"
+		fi
+
+		if [[ ${CTARGET} == *-linux* ]] ; then
+			local run_kv build_kv want_kv
+
+			run_kv=$(g_get_running_KV)
+			build_kv=$(g_int_to_KV $(get_kheader_version))
+			want_kv=${MIN_KERN_VER}
+
+			if ! is_crosscompile && ! tc-is-cross-compiler ; then
+				# Building fails on an non-supporting kernel
+				ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
+				if ! eend_KV ${run_kv} ${want_kv} ; then
+					echo
+					eerror "You need a kernel of at least ${want_kv}!"
+					die "Kernel version too low!"
+				fi
+			fi
+
+			ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
+			if ! eend_KV ${build_kv} ${want_kv} ; then
+				echo
+				eerror "You need linux-headers of at least ${want_kv}!"
+				die "linux-headers version too low!"
+			fi
+		fi
+	fi
+}
+
+#
+# the phases
+#
+
+# pkg_pretend
+
+pkg_pretend() {
+	# All the checks...
+	einfo "Checking general environment sanity."
+	sanity_prechecks
+}
+
+pkg_setup() {
+	# see bug 682570
+	[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
+}
+
+# src_unpack
+
+src_unpack() {
+	# Consistency is not guaranteed between pkg_ and src_ ...
+	sanity_prechecks
+
+	use multilib-bootstrap && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
+
+	setup_env
+
+	if [[ ${PV} == 9999* ]] ; then
+		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git"
+		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
+		git-r3_src_unpack
+		mv patches-git/9999 patches || die
+
+		EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
+		EGIT_CHECKOUT_DIR=${S}
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.xz
+
+		cd "${WORKDIR}" || die
+		unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
+	fi
+
+	cd "${WORKDIR}" || die
+	unpack locale-gen-${LOCALE_GEN_VER}.tar.gz
+}
+
+src_prepare() {
+	local patchsetname
+	if ! use vanilla ; then
+		if [[ ${PV} == 9999* ]] ; then
+			patchsetname="from git master"
+		else
+			patchsetname="${RELEASE_VER}-${PATCH_VER}"
+		fi
+		elog "Applying Gentoo Glibc Patchset ${patchsetname}"
+		eapply "${WORKDIR}"/patches
+		einfo "Done."
+	fi
+
+	default
+
+	gnuconfig_update
+
+	cd "${WORKDIR}"
+	find . -name configure -exec touch {} +
+
+	# move the external locale-gen to its old place
+	mkdir extra || die
+	mv locale-gen-${LOCALE_GEN_VER} extra/locale || die
+
+	eprefixify extra/locale/locale-gen
+
+	# Fix permissions on some of the scripts.
+	chmod u+x "${S}"/scripts/*.sh
+
+	cd "${S}"
+}
+
+glibc_do_configure() {
+	# Glibc does not work with gold (for various reasons) #269274.
+	tc-ld-disable-gold
+
+	# CXX isnt handled by the multilib system, so if we dont unset here
+	# we accumulate crap across abis
+	unset CXX
+
+	einfo "Configuring glibc for nptl"
+
+	if use doc ; then
+		export MAKEINFO=makeinfo
+	else
+		export MAKEINFO=/dev/null
+	fi
+
+	local v
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM READELF; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+
+	# CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
+	# To build .S (assembly) files with the same ABI-specific flags
+	# upstream currently recommends adding CFLAGS to CC/CXX:
+	#    https://sourceware.org/PR23273
+	# Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
+	# and breaks multiarch support. See 659030#c3 for an example.
+	# The glibc configure script doesn't properly use LDFLAGS all the time.
+	export CC="$(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+
+	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
+	export CXX="$(tc-getCXX ${CTARGET}) $(get_abi_CFLAGS) ${CFLAGS}"
+
+	if is_crosscompile; then
+		# Assume worst-case bootstrap: glibc is buil first time
+		# when ${CTARGET}-g++ is not available yet. We avoid
+		# building auxiliary programs that require C++: bug #683074
+		# It should not affect final result.
+		export libc_cv_cxx_link_ok=no
+		# The line above has the same effect. We set CXX explicitly
+		# to make build logs less confusing.
+		export CXX=
+	fi
+	einfo " $(printf '%15s' 'Manual CXX:')   ${CXX}"
+
+	# Always use tuple-prefixed toolchain. For non-native ABI glibc's configure
+	# can't detect them automatically due to ${CHOST} mismatch and fallbacks
+	# to unprefixed tools. Similar to multilib.eclass:multilib_toolchain_setup().
+	export NM="$(tc-getNM ${CTARGET})"
+	export READELF="$(tc-getREADELF ${CTARGET})"
+	einfo " $(printf '%15s' 'Manual NM:')   ${NM}"
+	einfo " $(printf '%15s' 'Manual READELF:')   ${READELF}"
+
+	echo
+
+	local myconf=()
+
+	case ${CTARGET} in
+		m68k*)
+			# setjmp() is not compatible with stack protection:
+			# https://sourceware.org/PR24202
+			myconf+=( --enable-stack-protector=no )
+			;;
+		*)
+			# Use '=strong' instead of '=all' to protect only functions
+			# worth protecting from stack smashes.
+			# '=all' is also known to have a problem in IFUNC resolution
+			# tests: https://sourceware.org/PR25680, bug #712356.
+			myconf+=( --enable-stack-protector=$(usex ssp strong no) )
+			;;
+	esac
+	myconf+=( --enable-stackguard-randomization )
+
+	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
+	# is not robust enough to detect proper support:
+	#    https://bugs.gentoo.org/641216
+	#    https://sourceware.org/PR22634#c0
+	case $(tc-arch ${CTARGET}) in
+		# Keep whitelist of targets where autodetection mostly works.
+		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
+		# Blacklist everywhere else
+		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
+	esac
+
+	# Enable Intel Control-flow Enforcement Technology on amd64 if requested
+	case ${CTARGET} in
+		x86_64-*) myconf+=( $(use_enable cet) ) ;;
+		*) ;;
+	esac
+
+	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
+
+	myconf+=( --enable-kernel=${MIN_KERN_VER} )
+
+	# Since SELinux support is only required for nscd, only enable it if:
+	# 1. USE selinux
+	# 2. only for the primary ABI on multilib systems
+	# 3. Not a crosscompile
+	if ! is_crosscompile && use selinux ; then
+		if use multilib ; then
+			if is_final_abi ; then
+				myconf+=( --with-selinux )
+			else
+				myconf+=( --without-selinux )
+			fi
+		else
+			myconf+=( --with-selinux )
+		fi
+	else
+		myconf+=( --without-selinux )
+	fi
+
+	# Force a few tests where we always know the answer but
+	# configure is incapable of finding it.
+	if is_crosscompile ; then
+		export \
+			libc_cv_c_cleanup=yes \
+			libc_cv_forced_unwind=yes
+	fi
+
+	myconf+=(
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		$(use_enable profile)
+		$(use_with gd)
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		--sysconfdir="$(host_eprefix)/etc"
+		--localstatedir="$(host_eprefix)/var"
+		--libdir='$(prefix)'/$(get_libdir)
+		--mandir='$(prefix)'/share/man
+		--infodir='$(prefix)'/share/info
+		--libexecdir='$(libdir)'/misc/glibc
+		--with-bugurl=https://bugs.gentoo.org/
+		--with-pkgversion="$(glibc_banner)"
+		$(use_enable crypt)
+		$(use_multiarch || echo --disable-multi-arch)
+		$(use_enable static-pie)
+		$(use_enable systemtap)
+		$(use_enable nscd)
+
+		# locale data is arch-independent
+		# https://bugs.gentoo.org/753740
+		libc_cv_complocaledir='${exec_prefix}/lib/locale'
+
+		${EXTRA_ECONF}
+	)
+
+	# We rely on sys-libs/timezone-data for timezone tools normally.
+	myconf+=( $(use_enable vanilla timezone-tools) )
+
+	# These libs don't have configure flags.
+	ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
+	ac_cv_lib_cap_cap_init=$(usex caps || echo no)
+
+	# There is no configure option for this and we need to export it
+	# since the glibc build will re-run configure on itself
+	export libc_cv_rootsbindir="$(host_eprefix)/sbin"
+	export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)"
+
+	# We take care of patching our binutils to use both hash styles,
+	# and many people like to force gnu hash style only, so disable
+	# this overriding check.  #347761
+	export libc_cv_hashstyle=no
+
+	local builddir=$(builddir nptl)
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+	set -- "${S}"/configure "${myconf[@]}"
+	echo "$@"
+	"$@" || die "failed to configure glibc"
+
+	# ia64 static cross-compilers are a pita in so much that they
+	# can't produce static ELFs (as the libgcc.a is broken).  so
+	# disable building of the programs for those targets if it
+	# doesn't work.
+	# XXX: We could turn this into a compiler test, but ia64 is
+	# the only one that matters, so this should be fine for now.
+	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
+		sed -i '1i+link-static = touch $@' config.make
+	fi
+
+	# If we're trying to migrate between ABI sets, we need
+	# to lie and use a local copy of gcc.  Like if the system
+	# is built with MULTILIB_ABIS="amd64 x86" but we want to
+	# add x32 to it, gcc/glibc don't yet support x32.
+	#
+	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib-bootstrap ; then
+		echo 'main(){}' > "${T}"/test.c
+		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
+			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
+		fi
+	fi
+}
+
+glibc_headers_configure() {
+	export ABI=default
+
+	local builddir=$(builddir "headers")
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+
+	# if we don't have a compiler yet, we can't really test it now ...
+	# hopefully they don't affect header generation, so let's hope for
+	# the best here ...
+	local v vars=(
+		ac_cv_header_cpuid_h=yes
+		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
+		libc_cv_asm_cfi_directives=yes
+		libc_cv_broken_visibility_attribute=no
+		libc_cv_c_cleanup=yes
+		libc_cv_compiler_powerpc64le_binary128_ok=yes
+		libc_cv_forced_unwind=yes
+		libc_cv_gcc___thread=yes
+		libc_cv_mlong_double_128=yes
+		libc_cv_mlong_double_128ibm=yes
+		libc_cv_ppc_machine=yes
+		libc_cv_ppc_rel16=yes
+		libc_cv_predef_fortify_source=no
+		libc_cv_target_power8_ok=yes
+		libc_cv_visibility_attribute=yes
+		libc_cv_z_combreloc=yes
+		libc_cv_z_execstack=yes
+		libc_cv_z_initfirst=yes
+		libc_cv_z_nodelete=yes
+		libc_cv_z_nodlopen=yes
+		libc_cv_z_relro=yes
+		libc_mips_abi=${ABI}
+		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
+		# These libs don't have configure flags.
+		ac_cv_lib_audit_audit_log_user_avc_message=no
+		ac_cv_lib_cap_cap_init=no
+	)
+
+	einfo "Forcing cached settings:"
+	for v in "${vars[@]}" ; do
+		einfo " ${v}"
+		export ${v}
+	done
+
+	local headers_only_arch_CPPFLAGS=()
+
+	# Blow away some random CC settings that screw things up. #550192
+	if [[ -d ${S}/sysdeps/mips ]]; then
+		pushd "${S}"/sysdeps/mips >/dev/null
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
+
+		# Force the mips ABI to the default.  This is OK because the set of
+		# installed headers in this phase is the same between the 3 ABIs.
+		# If this ever changes, this hack will break, but that's unlikely
+		# as glibc discourages that behavior.
+		# https://crbug.com/647033
+		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
+
+		popd >/dev/null
+	fi
+
+	case ${CTARGET} in
+	riscv*)
+		# RISC-V interrogates the compiler to determine which target to
+		# build.  If building the headers then we don't strictly need a
+		# RISC-V compiler, so the built-in definitions that are provided
+		# along with all RISC-V compiler might not exist.  This causes
+		# glibc's RISC-V preconfigure script to blow up.  Since we're just
+		# building the headers any value will actually work here, so just
+		# pick the standard one (rv64g/lp64d) to make the build scripts
+		# happy for now -- the headers are all the same anyway so it
+		# doesn't matter.
+		headers_only_arch_CPPFLAGS+=(
+			-D__riscv_xlen=64
+			-D__riscv_flen=64
+			-D__riscv_float_abi_double=1
+			-D__riscv_atomic=1
+		) ;;
+	esac
+
+	local myconf=()
+	myconf+=(
+		--disable-sanity-checks
+		--enable-hacker-mode
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		${EXTRA_ECONF}
+	)
+
+	# Nothing is compiled here which would affect the headers for the target.
+	# So forcing CC/CFLAGS is sane.
+	local headers_only_CC=$(tc-getBUILD_CC)
+	local headers_only_CFLAGS="-O1 -pipe"
+	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
+	local headers_only_LDFLAGS=""
+	set -- "${S}"/configure "${myconf[@]}"
+	echo \
+		"CC=${headers_only_CC}" \
+		"CFLAGS=${headers_only_CFLAGS}" \
+		"CPPFLAGS=${headers_only_CPPFLAGS}" \
+		"LDFLAGS=${headers_only_LDFLAGS}" \
+		"$@"
+	CC=${headers_only_CC} \
+	CFLAGS=${headers_only_CFLAGS} \
+	CPPFLAGS=${headers_only_CPPFLAGS} \
+	LDFLAGS="" \
+	"$@" || die "failed to configure glibc"
+}
+
+do_src_configure() {
+	if just_headers ; then
+		glibc_headers_configure
+	else
+		glibc_do_configure nptl
+	fi
+}
+
+src_configure() {
+	foreach_abi do_src_configure
+}
+
+do_src_compile() {
+	emake -C "$(builddir nptl)"
+}
+
+src_compile() {
+	if just_headers ; then
+		return
+	fi
+
+	foreach_abi do_src_compile
+}
+
+glibc_src_test() {
+	cd "$(builddir nptl)"
+
+	local myxfailparams=""
+	if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then
+		for myt in ${XFAIL_TEST_LIST[@]} ; do
+			myxfailparams+="test-xfail-${myt}=yes "
+		done
+	fi
+
+	# sandbox does not understand unshare() and prevents
+	# writes to /proc/, which makes many tests fail
+
+	SANDBOX_ON=0 LD_PRELOAD= emake ${myxfailparams} check
+}
+
+do_src_test() {
+	local ret=0
+
+	glibc_src_test
+	: $(( ret |= $? ))
+
+	return ${ret}
+}
+
+src_test() {
+	if just_headers ; then
+		return
+	fi
+
+	# Give tests more time to complete.
+	export TIMEOUTFACTOR=5
+
+	foreach_abi do_src_test || die "tests failed"
+}
+
+run_locale_gen() {
+	# if the host locales.gen contains no entries, we'll install everything
+	local root="$1"
+	local inplace=""
+
+	if [[ "${root}" == "--inplace-glibc" ]] ; then
+		inplace="--inplace-glibc"
+		root="$2"
+	fi
+
+	local locale_list="${root}/etc/locale.gen"
+
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
+		[[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
+		locale_list="${root}/usr/share/i18n/SUPPORTED"
+	fi
+
+	set -- locale-gen ${inplace} --jobs $(makeopts_jobs) --config "${locale_list}" \
+		--destdir "${root}"
+	echo "$@"
+	"$@"
+
+	popd >/dev/null
+}
+
+glibc_do_src_install() {
+	local builddir=$(builddir nptl)
+	cd "${builddir}"
+
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install
+
+	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
+	# which come without headers etc. Only needed for binary packages since the
+	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
+	find "${D}" -name "libnsl.a" -delete
+	find "${D}" -name "libnsl.so" -delete
+
+	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
+	# to infer upstream version:
+	# '#define VERSION "2.26.90"' -> '2.26.90'
+	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
+
+	# Avoid stripping binaries not targeted by ${CHOST}. Or else
+	# ${CHOST}-strip would break binaries build for ${CTARGET}.
+	is_crosscompile && dostrip -x /
+	# gdb thread introspection relies on local libpthreas symbols. stripping breaks it
+	# See Note [Disable automatic stripping]
+	dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
+
+	if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
+		# Move versioned .a file out of libdir to evade portage QA checks
+		# instead of using gen_usr_ldscript(). We fix ldscript as:
+		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
+		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"/$(alt_usrlibdir)/libm.a || die
+		dodir $(alt_usrlibdir)/${P}
+		mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+	fi
+
+	# We'll take care of the cache ourselves
+	rm -f "${ED}"/etc/ld.so.cache
+
+	# Everything past this point just needs to be done once ...
+	is_final_abi || return 0
+
+	# Make sure the non-native interp can be found on multilib systems even
+	# if the main library set isn't installed into the right place.  Maybe
+	# we should query the active gcc for info instead of hardcoding it ?
+	local i ldso_abi ldso_name
+	local ldso_abi_list=(
+		# x86
+		amd64   /lib64/ld-linux-x86-64.so.2
+		x32     /libx32/ld-linux-x32.so.2
+		x86     /lib/ld-linux.so.2
+		# mips
+		o32     /lib/ld.so.1
+		n32     /lib32/ld.so.1
+		n64     /lib64/ld.so.1
+		# powerpc
+		ppc     /lib/ld.so.1
+		ppc64   /lib64/ld64.so.1
+		# riscv
+		ilp32d  /lib/ld-linux-riscv32-ilp32d.so.1
+		ilp32   /lib/ld-linux-riscv32-ilp32.so.1
+		lp64d   /lib/ld-linux-riscv64-lp64d.so.1
+		lp64    /lib/ld-linux-riscv64-lp64.so.1
+		# s390
+		s390    /lib/ld.so.1
+		s390x   /lib/ld64.so.1
+		# sparc
+		sparc32 /lib/ld-linux.so.2
+		sparc64 /lib64/ld-linux.so.2
+	)
+	case $(tc-endian) in
+	little)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64.so.1
+		)
+		;;
+	big)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64_be.so.1
+		)
+		;;
+	esac
+	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
+	fi
+	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
+		ldso_abi=${ldso_abi_list[i]}
+		has ${ldso_abi} $(get_install_abis) || continue
+
+		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
+		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
+			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
+		fi
+	done
+
+	# With devpts under Linux mounted properly, we do not need the pt_chown
+	# binary to be setuid.  This is because the default owners/perms will be
+	# exactly what we want.
+	if ! use suid ; then
+		find "${ED}" -name pt_chown -exec chmod -s {} +
+	fi
+
+	#################################################################
+	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+	# Make sure we install some symlink hacks so that when we build
+	# a 2nd stage cross-compiler, gcc finds the target system
+	# headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		# We need to make sure that /lib and /usr/lib always exists.
+		# gcc likes to use relative paths to get to its multilibs like
+		# /usr/lib/../lib64/.  So while we don't install any files into
+		# /usr/lib/, we do need it to exist.
+		keepdir $(alt_prefix)/lib
+		keepdir $(alt_prefix)/usr/lib
+
+		dosym usr/include $(alt_prefix)/sys-include
+		return 0
+	fi
+
+	# Files for Debian-style locale updating
+	dodir /usr/share/i18n
+	sed \
+		-e "/^#/d" \
+		-e "/SUPPORTED-LOCALES=/d" \
+		-e "s: \\\\::g" -e "s:/: :g" \
+		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
+		|| die "generating /usr/share/i18n/SUPPORTED failed"
+	cd "${WORKDIR}"/extra/locale
+	dosbin locale-gen
+	doman *.[0-8]
+	insinto /etc
+	doins locale.gen
+
+	keepdir /usr/lib/locale
+
+	cd "${S}"
+
+	# Install misc network config files
+	insinto /etc
+	doins posix/gai.conf nss/nsswitch.conf
+
+	# Gentoo-specific
+	newins "${FILESDIR}"/host.conf-1 host.conf
+
+	if use nscd ; then
+		doins nscd/nscd.conf
+
+		newinitd "$(prefixify_ro "${FILESDIR}"/nscd-1)" nscd
+
+		local nscd_args=(
+			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
+		)
+
+		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
+
+		systemd_dounit nscd/nscd.service
+		systemd_newtmpfilesd nscd/nscd.tmpfiles nscd.conf
+	fi
+
+	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
+	doenvd "${T}"/00glibc
+
+	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
+		[[ -s ${d} ]] && dodoc ${d}
+	done
+	dodoc -r ChangeLog.old
+
+	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
+	# creation of the "factory" symlink in pkg_postinst().
+	rm -f "${ED}"/etc/localtime
+
+	# Generate all locales if this is a native build as locale generation
+	if use compile-locales && ! is_crosscompile ; then
+		run_locale_gen --inplace-glibc "${ED}/"
+		sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die
+	fi
+}
+
+glibc_headers_install() {
+	local builddir=$(builddir "headers")
+	cd "${builddir}"
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers
+
+	insinto $(alt_headers)/gnu
+	doins "${S}"/include/gnu/stubs.h
+
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	dosym usr/include $(alt_prefix)/sys-include
+}
+
+src_install() {
+	if just_headers ; then
+		export ABI=default
+		glibc_headers_install
+		return
+	fi
+
+	foreach_abi glibc_do_src_install
+
+	if ! use static-libs ; then
+		elog "Not installing static glibc libraries"
+		find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
+	fi
+}
+
+# Simple test to make sure our new glibc isn't completely broken.
+# Make sure we don't test with statically built binaries since
+# they will fail.  Also, skip if this glibc is a cross compiler.
+#
+# If coreutils is built with USE=multicall, some of these files
+# will just be wrapper scripts, not actual ELFs we can test.
+glibc_sanity_check() {
+	cd / #228809
+
+	# We enter ${ED} so to avoid trouble if the path contains
+	# special characters; for instance if the path contains the
+	# colon character (:), then the linker will try to split it
+	# and look for the libraries in an unexpected place. This can
+	# lead to unsafe code execution if the generated prefix is
+	# within a world-writable directory.
+	# (e.g. /var/tmp/portage:${HOSTNAME})
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	local x striptest
+	for x in cal date env free ls true uname uptime ; do
+		x=$(type -p ${x})
+		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
+		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
+		case ${striptest} in
+		*"statically linked"*) continue;;
+		*"ASCII text"*) continue;;
+		esac
+		# We need to clear the locale settings as the upgrade might want
+		# incompatible locale data.  This test is not for verifying that.
+		LC_ALL=C \
+		./ld-*.so --library-path . ${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
+
+	popd >/dev/null
+}
+
+pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	# prepare /etc/ld.so.conf.d/ for files
+	mkdir -p "${EROOT}"/etc/ld.so.conf.d
+
+	# Default /etc/hosts.conf:multi to on for systems with small dbs.
+	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
+		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
+		einfo "Defaulting /etc/host.conf:multi to on"
+	fi
+
+	[[ -n ${ROOT} ]] && return 0
+	[[ -d ${ED}/$(get_libdir) ]] || return 0
+	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
+
+	if [[ -L ${EROOT}/usr/lib/locale ]]; then
+		# Help portage migrate this to a directory
+		# https://bugs.gentoo.org/753740
+		rm "${EROOT}"/usr/lib/locale || die
+	fi
+}
+
+pkg_postinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
+		# Generate fastloading iconv module configuration file.
+		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
+	fi
+
+	if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
+		use compile-locales || run_locale_gen "${EROOT}/"
+	fi
+
+	# Check for sanity of /etc/nsswitch.conf, take 2
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+		local entry
+		for entry in passwd group shadow; do
+			if egrep -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+				ewarn ""
+				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+				ewarn "removed from glibc and is now provided by the package"
+				ewarn "  sys-auth/libnss-nis"
+				ewarn "Install it now to keep your NIS setup working."
+				ewarn ""
+			fi
+		done
+	fi
+}
diff --git a/sys-libs/kpmcore/Manifest b/sys-libs/kpmcore/Manifest
index ad934fd36e49..cd1a224c775e 100644
--- a/sys-libs/kpmcore/Manifest
+++ b/sys-libs/kpmcore/Manifest
@@ -1,5 +1,6 @@
+AUX kpmcore-4.2.0-kf-5.77.patch 1468 BLAKE2B 1dc930e1fb6cc01891ab3e9def4f843cd0e0d1c92e8f5ecd0105bd338a9f0f60c370039ee8aa2950385f846b18aab0169f89c3925198475e9908319f2e4cc96e SHA512 1e0ece24224bbfbe4d2a33c19834b55f84b0c2c08eb840b8ea63aeb45e9e8813f4ea069f5c2752e74b99144616b766a41a7fe77ae69c3b78bb474003cfa064e5
 DIST kpmcore-20.12.1.tar.xz 584128 BLAKE2B e3a4032f3dac60342799c6c2e91728e36b37af90a00d81e3eb5f12a3b0e3734742714d1a037c8f8ff893dcfdd8cb27348014920d985d5e93c3c387c914a48a2f SHA512 b59e97faee594eeb79c649638dde10d081752ee561af8e40d1503bba599a91f81af7730beec5302cb0991c10161188c064caf0efc12144a15dd37ce19b79d576
 DIST kpmcore-4.2.0.tar.xz 441320 BLAKE2B 5eeae806e47a1d068b2052b7706fbe16acfd609e3d0bcb396758f2055154e43b5b1fc7b7a65795ba0804ebc34c7d0cda18995ce3975e16e74d015ac9d8203e1e SHA512 71c5411f3ec24149695bbc1ec0c2bb7423b1cfd24ea9c2f33492c6310b1e911ea14a0a46a53024d7a1afebf0cbc5b56fb7cf5be22b832fb49239a270b63404f0
 EBUILD kpmcore-20.12.1.ebuild 754 BLAKE2B 9fb97f1a9ace20c87581112d998dbdd6ab2beb47989d20363080b86d686c5ec7218f95405a771023e8516cc1df875236419a85b6d0d16fc27f68f7c8da9f6167 SHA512 dd9f748201826d965fc0e96fd994cdc20972e2a5747a77f291af8189086b073a52f5efdd80b9f6a36ae3f242771738130c1e21e23be52b1e519bc6f65d348dbc
-EBUILD kpmcore-4.2.0.ebuild 870 BLAKE2B 587696037266fe5d19933168d8796db92cd9ca33811708da39455b59fd87bfb54d9ec565fb08cde74a98665a167837bbd3f398c3bfd8052699d33a524c4781ae SHA512 1a6f4c16e2e92270aaf74dd9d85d78fae705dbeb92568eb27b9fa12c81d4e6bbd655a5ba91503e9a2464663e4352874099bc21ce351512a24230272bdca11f90
+EBUILD kpmcore-4.2.0.ebuild 929 BLAKE2B 249aa44c720455172855b55169eb4d48cf78f0d7e32d5f958815f7115c149b415a0ec46c1d668d0438424d399178e9b4d0e867a16b25eb026762ab2504b49aaf SHA512 14534457c2155ab9529663fafbb85c14b85bb1d114ac2902cf50b3acd1ce7494507d0afd173d709fec4c1a3f8b8d38de483019fde694112020424c11b172cd42
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-libs/kpmcore/files/kpmcore-4.2.0-kf-5.77.patch b/sys-libs/kpmcore/files/kpmcore-4.2.0-kf-5.77.patch
new file mode 100644
index 000000000000..f45ad5a682ba
--- /dev/null
+++ b/sys-libs/kpmcore/files/kpmcore-4.2.0-kf-5.77.patch
@@ -0,0 +1,50 @@
+From 07e5a3ac2858e6d38cc698e0f740e7a693e9f302 Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Mon, 16 Nov 2020 17:14:52 +0100
+Subject: [PATCH] Make plugins compatible to latest KPluginFactory code
+
+That one uses std::is_constructible<impl, QObject *, const QVariantList &>
+which will fail for our current plugin constructors due to being private
+and with only friend class KPluginFactory.
+---
+ src/plugins/dummy/dummybackend.h   | 4 +---
+ src/plugins/sfdisk/sfdiskbackend.h | 4 +---
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/src/plugins/dummy/dummybackend.h b/src/plugins/dummy/dummybackend.h
+index 815b020..8d67158 100644
+--- a/src/plugins/dummy/dummybackend.h
++++ b/src/plugins/dummy/dummybackend.h
+@@ -24,11 +24,9 @@ class QString;
+ */
+ class DummyBackend : public CoreBackend
+ {
+-    friend class KPluginFactory;
+-
+     Q_DISABLE_COPY(DummyBackend)
+ 
+-private:
++public:
+     DummyBackend(QObject* parent, const QList<QVariant>& args);
+ 
+ public:
+diff --git a/src/plugins/sfdisk/sfdiskbackend.h b/src/plugins/sfdisk/sfdiskbackend.h
+index e709f61..0571add 100644
+--- a/src/plugins/sfdisk/sfdiskbackend.h
++++ b/src/plugins/sfdisk/sfdiskbackend.h
+@@ -27,11 +27,9 @@ class QString;
+ */
+ class SfdiskBackend : public CoreBackend
+ {
+-    friend class KPluginFactory;
+-
+     Q_DISABLE_COPY(SfdiskBackend)
+ 
+-private:
++public:
+     SfdiskBackend(QObject* parent, const QList<QVariant>& args);
+ 
+ public:
+-- 
+GitLab
+
diff --git a/sys-libs/kpmcore/kpmcore-4.2.0.ebuild b/sys-libs/kpmcore/kpmcore-4.2.0.ebuild
index 2103dab3c119..6530cb3632d6 100644
--- a/sys-libs/kpmcore/kpmcore-4.2.0.ebuild
+++ b/sys-libs/kpmcore/kpmcore-4.2.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
@@ -20,6 +20,9 @@ LICENSE="GPL-3"
 SLOT="5/10"
 IUSE=""
 
+# bug 689468, tests need polkit etc.
+RESTRICT+=" test"
+
 BDEPEND="
 	>=kde-frameworks/kauth-${KFMIN}:5
 	virtual/pkgconfig
@@ -36,5 +39,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-# bug 689468, tests need polkit etc.
-RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${P}-kf-5.77.patch" ) # bug 768249
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 5eb71c007b9c..984654a066b4 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -5,6 +5,10 @@ AUX ncurses-6.0-pkg-config.patch 386 BLAKE2B 27a61878d45aa781291e18a2e18b8e861dd
 AUX ncurses-6.0-rxvt-unicode-9.15.patch 3759 BLAKE2B 88e1b6145c5d1afa9d319fdf1bb70967705cc0460fb87cb3897d0e86678b065bc365573859d1cb96ac4209e61a4c43a84cd0cc3b86680e965e3bf404271354ef SHA512 5601446d34421453fb8ed0e7172b4a5230ab4f10a6ded27e6dc52f82f121cb0af510dfc8f60d9ba0d3b9a1d90a8a832c38e24256e394d8ffccbbf12a109e2da4
 AUX ncurses-6.0-ticlib.patch 492 BLAKE2B df9e747a773b532aab42def40fa048a08ae4d02b83c78bfb5fd89b70b9b753534769c5c52a0d1adde7447cd25a286fc8b5d9f52f395c6287d7cd568f184242d7 SHA512 291ed033118673aed1bc5d3b54730d099dffccad7bbe9cb47275bb216125ef9016225eaccae620fa3b06533b7633061a8029e19c8cb9f73c3e30499f587353d6
 AUX ncurses-6.2-no_user_ldflags_in_libs.patch 1254 BLAKE2B ccc2cd660bf102b61118f0ca170d079454b47a2eee41f9fb1e2b82dc241233adeb1481221fc25ce15b8c101cab200e5eefffde4ff0fbf102d8acf16fe222c40c SHA512 17e365302c683b7fc59b4ed870738b8ab487b9cc1e074d9629e1963120b6ea69b4c3b47b42c80524630d56e1b27519c6f8451397ae892ad759d1d0f019057418
+AUX ncurses-6.2_p20210123-cppflags-cross.patch 1246 BLAKE2B f2e6d5b3f106639435f1901f0a43aaf9ab1cfcc2c295f13cd51120f13bb09ee4e6863aee3e6036b175479235ba8804622ad1ad4e4f181e9ca7ac67ae98ff13f1 SHA512 89a1471bc1dec666a593819b15d778d061fb370fc9786251b0546535cebf46b7ff61579937e64bf35cd15e4b8493e49c74625fb9686bb003935eef017cf449da
+AUX ncurses-6.2_p20210123-no_user_ldflags_in_libs.patch 1262 BLAKE2B 06de969e051fc167729318162500b529a0da243501e33c9cd915f5a853c78445147a6cee22b06e9577fd5821ec0820c05a908933fc9de64b672fdcaf60a74e08 SHA512 09f340e8359ea361e639af7d62f747e59e55b8a186724f6c833dd4a3067046d5b82400069900b7a3b8ca51bdee976e4eb550ad246cd843f85331d331db18e2f0
 DIST ncurses-6.2.tar.gz 3425862 BLAKE2B 6680cd7a369a4cb8234442a70869c283f0db6db9d7da1da2a7a5c519eb862a2c9b9411957d99f9ebb5089cad00b42e1ca6bc0784327461113df2eeaec695913c SHA512 4c1333dcc30e858e8a9525d4b9aefb60000cfc727bc4a1062bace06ffc4639ad9f6e54f6bdda0e3a0e5ea14de995f96b52b3327d9ec633608792c99a1e8d840d
+DIST ncurses-6.2_p20210123.patch.xz 519076 BLAKE2B 790ca80f0b7cdba2e75e3ace91e7f40a740594bdcb19930f64a5aaad8ba041f9ee6057e0a856050e5ef54f79ffe21f23897477dd186790fce9f8192d6149e8fc SHA512 f0d4ef317157472400f183e9ba65102e342e996c4f1d99924ece72305064c3d8616668bb2c81c6113b4bd145b1589844f8c948e6424d4372939752364bed6141
 EBUILD ncurses-6.2-r1.ebuild 10022 BLAKE2B cad77942242cec2929dc0199ada0dc92a42bf4f49eb490b49bcb8db0175d04d403d063de5fa4fb59649b07bc21ada8e72c4b9412329cd9817119cc0a04db7dc4 SHA512 b7693f3b64b11c80a7cab0ff1aee64b1a9f842e7ed682daa75850952c005e7f1b870f173ee78b5883c91f82d9ff42cfb3f45ba4f017a323daedaf7145a69e970
+EBUILD ncurses-6.2_p20210123.ebuild 10136 BLAKE2B 7b63b7a7ba3ac71e6df2f0eb1ed99b621b6463684577a3dd956c7d816434b61e351b6f188225aacc422c4d230d085f4e7e42b6c8c4de3b7c2b95d82eb43b4a97 SHA512 3e6155661224db0e5a3a3e81f257d1c2b2f6477d843b80abd61743aab5fba0f7070fd5c9535507abbf12f1edeb76e9aa82be6f69d332a94869033705e5feeac5
 MISC metadata.xml 696 BLAKE2B 00deabf0f9a310870a8080425ee4df0e581c6871565f5f3c42c823f51bb4fabac4a8980e371f2bd142a982b6369527bee184ecb941e5d5f31697a871cd0a8237 SHA512 ff73226dc25e761ad9106768fc7ad0d2c40b6fefd3beced9ba5dfcc31a499220408fb2f2a6fd8aa53bb360398154a3653bf0e0ddb16c4ef4e5e89fe60752b7b5
diff --git a/sys-libs/ncurses/files/ncurses-6.2_p20210123-cppflags-cross.patch b/sys-libs/ncurses/files/ncurses-6.2_p20210123-cppflags-cross.patch
new file mode 100644
index 000000000000..1087bf5c9cb7
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-6.2_p20210123-cppflags-cross.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/601426
+https://lists.gnu.org/archive/html/bug-ncurses/2015-02/msg00012.html
+
+From: John Vogel
+Subject: [PATCH] c++ binding missed when cross compiling
+Date: Mon, 16 Feb 2015 01:01:48 -0500
+
+The configure script hard codes the include dir to the prefix'ed include dir,
+when checking if c++ compiler works. This breaks the compiler's built-in search
+path. I've included two patches. The first works on the configure.in file, which
+requires your autoconf stuff to test and I'm not ready to meddle with at the
+moment. The other works directly on the configure file. I've tested the second
+one; it should mirror what the first patch tries to achieve and works for me.
+
+--- a/configure
++++ b/configure
+@@ -3459,10 +3459,6 @@
+ 		echo "$as_me:3459: checking if $CXX works" >&5
+ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
+ 
+-		save_CPPFLAGS="$CPPFLAGS"
+-		eval cf_includedir=${includedir}
+-		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
+-
+ cat >"conftest.$ac_ext" <<_ACEOF
+ #line 3467 "configure"
+ #include "confdefs.h"
+@@ -3499,7 +3495,6 @@
+ cf_cxx_works=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-		CPPFLAGS="$save_CPPFLAGS"
+ 
+ 		echo "$as_me:3504: result: $cf_cxx_works" >&5
+ echo "${ECHO_T}$cf_cxx_works" >&6
diff --git a/sys-libs/ncurses/files/ncurses-6.2_p20210123-no_user_ldflags_in_libs.patch b/sys-libs/ncurses/files/ncurses-6.2_p20210123-no_user_ldflags_in_libs.patch
new file mode 100644
index 000000000000..fde03f1d56f4
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-6.2_p20210123-no_user_ldflags_in_libs.patch
@@ -0,0 +1,40 @@
+From 6af3253a91d8844f16924a77349f162060e038fa Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 13 Feb 2020 11:51:09 +0100
+Subject: [PATCH] Don't bleed user LDFLAGS into Libs
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ misc/gen-pkgconfig.in  | 2 +-
+ misc/ncurses-config.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
+index 5a71ab02..9fa2e0a1 100644
+--- a/misc/gen-pkgconfig.in
++++ b/misc/gen-pkgconfig.in
+@@ -83,7 +83,7 @@ if [ "$includedir" != "/usr/include" ]; then
+ fi
+ 
+ lib_flags=
+-for opt in -L$libdir @LDFLAGS@ @EXTRA_PKG_LDFLAGS@ @LIBS@
++for opt in -L$libdir @LIBS@
+ do
+ 	case $opt in
+ 	-l*) # LIBS is handled specially below
+diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
+index eae39a51..a25e2787 100644
+--- a/misc/ncurses-config.in
++++ b/misc/ncurses-config.in
+@@ -101,7 +101,7 @@ fi
+ # There is no portable way to find the list of standard library directories. 
+ # Require a POSIX shell anyway, to keep this simple.
+ lib_flags=
+-for opt in -L$libdir @LDFLAGS@ @EXTRA_PKG_LDFLAGS@ $LIBS
++for opt in -L$libdir $LIBS
+ do
+ 	case $opt in
+ 	-specs*) # ignore linker specs-files which were used to build library
+-- 
+2.30.0
+
diff --git a/sys-libs/ncurses/ncurses-6.2_p20210123.ebuild b/sys-libs/ncurses/ncurses-6.2_p20210123.ebuild
new file mode 100644
index 000000000000..df45a2a66cd4
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-6.2_p20210123.ebuild
@@ -0,0 +1,327 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript
+
+MY_PV="${PV:0:3}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="console display library"
+HOMEPAGE="https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/"
+SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
+
+if [[ "${PV}" == *_p* ]] ; then
+	#SRC_URI+=" ftp://ftp.invisible-island.net/${PN}/${PV/_p*}/${P/_p/-}-patch.sh.bz2
+	#	https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${P/_p/-}-patch.sh.bz2"
+	SRC_URI+=" https://dev.gentoo.org/~polynomial-c/dist/${P}.patch.xz"
+fi
+
+LICENSE="MIT"
+# The subslot reflects the SONAME.
+SLOT="0/6"
+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="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
+RESTRICT="!test? ( test )"
+
+DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
+#	berkdb? ( sys-libs/db )"
+# Block the older ncurses that installed all files w/SLOT=5. #557472
+RDEPEND="${DEPEND}
+	!<=sys-libs/ncurses-5.9-r4:5
+	!<sys-libs/slang-2.3.2_pre23
+	!<x11-terms/rxvt-unicode-9.06-r3
+	!<x11-terms/st-0.6-r1"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.7-nongnu.patch"
+	"${FILESDIR}/${PN}-6.0-rxvt-unicode-9.15.patch" #192083 #383871
+	"${FILESDIR}/${PN}-6.0-pkg-config.patch"
+	"${FILESDIR}/${PN}-6.0-ticlib.patch" #557360
+	"${FILESDIR}/${PN}-6.2_p20210123-cppflags-cross.patch" #601426
+	"${FILESDIR}/${PN}-6.2_p20210123-no_user_ldflags_in_libs.patch"
+)
+
+src_prepare() {
+	if [[ "${PV}" == *_p* ]] ; then
+		#eapply "${WORKDIR}"/${P/_p/-}-patch.sh
+		eapply "${WORKDIR}/${P}.patch"
+	fi
+	default
+}
+
+src_configure() {
+	unset TERMINFO #115036
+	tc-export_build_env BUILD_{CC,CPP}
+	BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
+
+	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
+	# Order matters here -- we want unicode/thread versions to come last so that the
+	# binaries in /usr/bin support both wide and narrow.
+	# The naming is also important as we use these directly with filenames and when
+	# checking configure flags.
+	NCURSES_TARGETS=(
+		ncurses
+		$(usex unicode 'ncursesw' '')
+		$(usex threads 'ncursest' '')
+		$(use unicode && usex threads 'ncursestw' '')
+	)
+
+	# When installing ncurses, we have to use a compatible version of tic.
+	# This comes up when cross-compiling, doing multilib builds, upgrading,
+	# or installing for the first time.  Build a local copy of tic whenever
+	# the host version isn't available. #249363 #557598
+	if ! has_version -b "~sys-libs/${P}:0" ; then
+		local lbuildflags="-static"
+
+		# some toolchains don't quite support static linking
+		local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
+		case ${CHOST} in
+			*-darwin*)  dbuildflags=     ;;
+			*-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;;
+		esac
+		echo "int main() {}" | \
+			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
+			|| lbuildflags="${dbuildflags}"
+
+		# We can't re-use the multilib BUILD_DIR because we run outside of it.
+		BUILD_DIR="${WORKDIR}" \
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
+		do_configure cross --without-shared --with-normal
+	fi
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_configure "${t}"
+	done
+}
+
+do_configure() {
+	local target=$1
+	shift
+
+	mkdir "${BUILD_DIR}/${target}" || die
+	cd "${BUILD_DIR}/${target}" || die
+
+	local conf=(
+		# We need the basic terminfo files in /etc, bug #37026.  We will
+		# add '--with-terminfo-dirs' and then populate /etc/terminfo in
+		# src_install() ...
+		--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
+
+		# Disabled until #245417 is sorted out.
+		#$(use_with berkdb hashed-db)
+
+		# Enable installation of .pc files.
+		--enable-pc-files
+		# This path is used to control where the .pc files are installed.
+		--with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
+
+		# Now the rest of the various standard flags.
+		--with-shared
+		--without-hashed-db
+		$(use_with ada)
+		$(use_with cxx)
+		$(use_with cxx cxx-binding)
+		--with-cxx-shared
+		$(use_with debug)
+		$(use_with profile)
+		# The configure script uses ldd to parse the linked output which
+		# is flaky for cross-compiling/multilib/ldd versions/etc...
+		$(use_with gpm gpm libgpm.so.1)
+		# Required for building  on mingw-w64, and possibly other windows
+		# platforms, bug #639670
+		$(use_enable kernel_Winnt term-driver)
+		--disable-termcap
+		--enable-symlinks
+		--with-rcs-ids
+		--with-manpage-format=normal
+		--enable-const
+		--enable-colorfgbg
+		--enable-hard-tabs
+		--enable-echo
+		$(use_enable !ada warnings)
+		$(use_with debug assertions)
+		$(use_enable !debug leaks)
+		$(use_with debug expanded)
+		$(use_with !debug macros)
+		$(multilib_native_with progs)
+		$(use_with test tests)
+		$(use_with trace)
+		$(use_with tinfo termlib)
+		--disable-stripping
+		--disable-pkg-ldflags
+	)
+
+	if [[ ${target} == ncurses*w ]] ; then
+		conf+=( --enable-widec )
+	else
+		conf+=( --disable-widec )
+	fi
+	if [[ ${target} == ncursest* ]] ; then
+		conf+=( --with-{pthread,reentrant} )
+	else
+		conf+=( --without-{pthread,reentrant} )
+	fi
+	# Make sure each variant goes in a unique location.
+	if [[ ${target} == "ncurses" ]] ; then
+		# "ncurses" variant goes into "${EPREFIX}"/usr/include
+		# It is needed on Prefix because the configure script appends
+		# "ncurses" to "${prefix}/include" if "${prefix}" is not /usr.
+		conf+=( --enable-overwrite )
+	else
+		conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
+	fi
+	# See comments in src_configure.
+	if [[ ${target} != "cross" ]] ; then
+		local cross_path="${WORKDIR}/cross"
+		[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
+	fi
+
+	# Force bash until upstream rebuilds the configure script with a newer
+	# version of autotools. #545532
+	#CONFIG_SHELL=${EPREFIX}/bin/bash \
+	ECONF_SOURCE="${S}" \
+	econf "${conf[@]}" "$@"
+}
+
+src_compile() {
+	# See comments in src_configure.
+	if ! has_version -b "~sys-libs/${P}:0" ; then
+		# We could possibly merge these two branches but opting to be
+		# conservative when merging some of the Prefix changes.
+
+		if [[ ${CHOST} == *-cygwin* ]] && ! multilib_is_native_abi ; then
+			# We make 'tic$(x)' here, for Cygwin having x=".exe".
+			BUILD_DIR="${WORKDIR}" \
+				 do_compile cross -C progs all PROGS='tic$(x)'
+		else
+			BUILD_DIR="${WORKDIR}" \
+				 do_compile cross -C progs tic
+		fi
+	fi
+
+	multilib-minimal_src_compile
+}
+
+multilib_src_compile() {
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_compile "${t}"
+	done
+}
+
+do_compile() {
+	local target=$1
+	shift
+
+	cd "${BUILD_DIR}/${target}" || die
+
+	# A little hack to fix parallel builds ... they break when
+	# generating sources so if we generate the sources first (in
+	# non-parallel), we can then build the rest of the package
+	# in parallel.  This is not really a perf hit since the source
+	# generation is quite small.
+	emake -j1 sources
+	# For some reason, sources depends on pc-files which depends on
+	# compiled libraries which depends on sources which ...
+	# Manually delete the pc-files file so the install step will
+	# create the .pc files we want.
+	rm -f misc/pc-files || die
+	emake "$@"
+}
+
+multilib_src_install() {
+	local target
+	for target in "${NCURSES_TARGETS[@]}" ; do
+		emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install
+	done
+
+	# Move main libraries into /.
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a \
+			"${NCURSES_TARGETS[@]}" \
+			$(use tinfo && usex unicode 'tinfow' '') \
+			$(usev tinfo)
+	fi
+	if ! tc-is-static-only ; then
+		# Provide a link for -lcurses.
+		ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
+	fi
+	# don't delete '*.dll.a', needed for linking #631468
+	if ! use static-libs; then
+		find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
+	fi
+
+	# Build fails to create this ...
+	# -FIXME-
+	# Ugly hackaround for riscv having two parts libdir (#689240)
+	# Replace this hack with an official solution once we have one...
+	# -FIXME-
+	dosym $(sed 's@[^/]\+@..@g' <<< $(get_libdir))/share/terminfo \
+		/usr/$(get_libdir)/terminfo
+}
+
+multilib_src_install_all() {
+#	if ! use berkdb ; then
+		# We need the basic terminfo files in /etc for embedded/recovery. #37026
+		einfo "Installing basic terminfo files in /etc..."
+		local terms=(
+			# Dumb/simple values that show up when using the in-kernel VT.
+			ansi console dumb linux
+			vt{52,100,102,200,220}
+			# [u]rxvt users used to be pretty common.  Probably should drop this
+			# since upstream is dead and people are moving away from it.
+			rxvt{,-unicode}{,-256color}
+			# xterm users are common, as is terminals re-using/spoofing it.
+			xterm xterm-{,256}color
+			# screen is common (and reused by tmux).
+			screen{,-256color}
+			screen.xterm-256color
+		)
+		local x
+		for x in "${terms[@]}"; do
+			local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
+			local basedir=$(basename "$(dirname "${termfile}")")
+
+			if [[ -n ${termfile} ]] ; then
+				dodir "/etc/terminfo/${basedir}"
+				mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die
+				dosym "../../../../etc/terminfo/${basedir}/${x}" \
+					"/usr/share/terminfo/${basedir}/${x}"
+			fi
+		done
+#	fi
+
+	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses
+
+	use minimal && rm -r "${ED}"/usr/share/terminfo*
+	# Because ncurses5-config --terminfo returns the directory we keep it
+	keepdir /usr/share/terminfo #245374
+
+	cd "${S}" || die
+	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+	if use doc ; then
+		docinto html
+		dodoc -r doc/html/
+	fi
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/libncurses.so.5
+	use unicode && preserve_old_lib /$(get_libdir)/libncursesw.so.5
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
+	use unicode && preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
+}
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 85927526ad8e..95190f203fe5 100644
Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ
diff --git a/sys-power/uhubctl/Manifest b/sys-power/uhubctl/Manifest
index 9d97d84ff7ba..07376dafb7d6 100644
--- a/sys-power/uhubctl/Manifest
+++ b/sys-power/uhubctl/Manifest
@@ -1,3 +1,5 @@
 DIST uhubctl-1.8.tar.gz 16158 BLAKE2B 1203e9711716987c0f60786cfe48a92a9a9a78f4bceb3851889a305a1289772375c6a512c361ba1e3e937fa1cb2f64e07365ef494e248e07a7a4f45f9e78c451 SHA512 fcc88ca47467e8e6085a75461495393306ddff1d6f7c9184c129bbdd044451b6430ac916f648b9f71c798054373f3d9102185e3d0c8f355c47e2574a1984ec9d
+DIST uhubctl-2.3.0.tar.gz 25367 BLAKE2B 7e5b6bf5f4a76e90a78292b23127af366e3388ffb8565fc1d763b9bd45faf0518411996a307a42c62827006ef9488e39282c95b2ba6c0bc289863cec7c91ac25 SHA512 e1ddc8d20b626e99facd8b0e6b746e2fdcaec667c7b280b656aa608b7990cfac1ea3e5379e89d0b1be8756ba5e91485ad003eb2bd5dfb3cc3c9cdf3d18ad1bd3
 EBUILD uhubctl-1.8-r1.ebuild 512 BLAKE2B 2a7ceb5488c6a6e27538b283fb73e0c900f9fb0f790c4d33d7e0e39d68028d11aa6d6aaaa962bbda540644ac977b1149e03c1d5a201035e2e383bdbc5e59df3a SHA512 78a2690aec04450bcea17296e9a1e48c55a0febca72bf5f21e945a304557fdd515d713a87d153cac5aadcccfc1e66dd12ca2b6eff3759c43ff56a331b67eae9f
+EBUILD uhubctl-2.3.0.ebuild 546 BLAKE2B b24952a3c08703e459fb6c7e6da4cefb9e54baeb801381965c4db760463c400354123603ee594c4f81fc1cee9283dc67b933686bbc1f824fbf0c205da988cd1c SHA512 a912a647faff98ee7dd4aaf7a3d630271ba72f0389b89498da624c0a58fb0216fa8c867fc2b6a754c9c9e5de4e2b0f866b51e056002e4271fd42d7e973cc0ae0
 MISC metadata.xml 247 BLAKE2B 0f6116ad1a6532d4d062e4e8dadf00f3053ccd4408f030535d3adc5f0399e43ac1682b3786a1a321ba7dd8c1b448cebc5938207a5af59fc033e0e6cf4c654c40 SHA512 8111616dc98858617382132291d5d7a4900eb04643a2c67d4c2eae21dbd08e2fd5f73d533befaa5a0c6a074b04046f1e5bf7a139386ca10ffffef329825d0514
diff --git a/sys-power/uhubctl/uhubctl-2.3.0.ebuild b/sys-power/uhubctl/uhubctl-2.3.0.ebuild
new file mode 100644
index 000000000000..094e1cc2428c
--- /dev/null
+++ b/sys-power/uhubctl/uhubctl-2.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="USB hub per-port power control"
+HOMEPAGE="https://github.com/mvp/uhubctl"
+SRC_URI="https://github.com/mvp/uhubctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s/^GIT_VERSION/#&/" \
+		Makefile \
+		|| die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 5d96c13ec94e..8f901d7c4d96 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/evisum/Manifest b/sys-process/evisum/Manifest
index 2a3846765cee..372d9c419462 100644
--- a/sys-process/evisum/Manifest
+++ b/sys-process/evisum/Manifest
@@ -1,5 +1,7 @@
+DIST evisum-0.5.10.tar.xz 4361448 BLAKE2B ab761f4312d90d3e4c0e2f381ec655b5ab9e9b55591cdcf179165c20ea91c390eb4c2e595ae261fdcd1f62f9c36e8bf6fd4dbaaf1c5fcb38ec7c2beb1e8edd1b SHA512 09f6f191df81c8d97c38a4c89b5a85d14be8e1dcde575a009d750447f64f90a854445802c8ddf2c68b9d2076c90746793a9d4e9f65deaf1a910798711598b9ad
 DIST evisum-0.5.8.tar.xz 6900320 BLAKE2B ea0a9ff248e502c2517b5350c598b413a3d0d4fbedf7b36ffe3d0269ef66b458b803cfe36077b42bb0aea6f66e70321028931e7c819c9378d0c2fa3f38e2a9ce SHA512 26f3404c95bdda85b2c4e33da5026e99fd326c5a9dd4b6357e2552507f851a12b451a0d47a521b71695e0e4812f7e4d81c09e2c50eda364597c0c083ea5e5dd1
 DIST evisum-0.5.9.tar.xz 6928640 BLAKE2B 38c4f0c40fa4747004a891522be2744793bd8c8a6f28ed22961737f17aaf5ebe178c24ef1e19bb31e834c8cb3bd35c95499e1ce3e41371716c558a4596374153 SHA512 6fcea6f2a7a7cfdfc8eccf7cccb10bdf7abe4990f420fa1947d45a5e3f49411b0b37ccef8f53b57d5db4ec9bf0cb9f92369b8c2aaa9a545469b5f3316db609cc
+EBUILD evisum-0.5.10.ebuild 435 BLAKE2B 562103ca6a8ea69c2953b7fab3ac496e263e74ba86d417a209854393e4bc578c8ea8a64ee23328a76ecb5b7a2f57467486df12e0058e48a00324d9a60d7b2307 SHA512 1bba29edc8b7f6356e1e6f5a10daa85f6a5d76777d9817b95f47bca81448ac10e62bfcc4d006f5823f2b0cb2439b4908bb62236754f0876d67f84be08412b1bd
 EBUILD evisum-0.5.8.ebuild 433 BLAKE2B 9c197ea2f644647eaab47a78f54a10c2d4cc2b5012fb468c79780d2b1ffaee80d6592b97fdf29a86976edec01ecd3a004cb9f2d40ed8e23d1c09a76111ee0349 SHA512 b75523e2eca5b20e2261512acda9b23bda9f433a27669e198225755a93c92914076854b4349d63e575946eb853be71ac6df1736b12337f56bf74cde07fdc711b
 EBUILD evisum-0.5.9.ebuild 435 BLAKE2B 562103ca6a8ea69c2953b7fab3ac496e263e74ba86d417a209854393e4bc578c8ea8a64ee23328a76ecb5b7a2f57467486df12e0058e48a00324d9a60d7b2307 SHA512 1bba29edc8b7f6356e1e6f5a10daa85f6a5d76777d9817b95f47bca81448ac10e62bfcc4d006f5823f2b0cb2439b4908bb62236754f0876d67f84be08412b1bd
 MISC metadata.xml 815 BLAKE2B d969cde79150c0cd2977017520a7ac95713b1c43aad52645f4d354f5a3ef3320638f5da097f0b7999689135036f1f8594b5331d2ca3420af93a2c3bfc726569e SHA512 c1b2c28863e8572ddfb79f8159e9ffc0defb4dc9c7b02c3ad7b1a4804ddcad06034471d9774f4e09bda1c84a8ce72393172f194c30cb5e5fda0a1177db842c3e
diff --git a/sys-process/evisum/evisum-0.5.10.ebuild b/sys-process/evisum/evisum-0.5.10.ebuild
new file mode 100644
index 000000000000..27f90bd1e8dd
--- /dev/null
+++ b/sys-process/evisum/evisum-0.5.10.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg
+
+DESCRIPTION="System and process monitor written with EFL"
+HOMEPAGE="https://www.enlightenment.org/"
+SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2 ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/efl"
+RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 727f1353075a..b629eb8c5ba0 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index b02c442ad64b..4144e636bf9e 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -15,6 +15,6 @@ EBUILD nextcloud-19.0.6.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2a
 EBUILD nextcloud-19.0.7.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2af4f258b11de4a8e22aa8ea6b94584ab734651ec7f7a26e3c9bac43ca2c02b84136d2a269213d3fb577fda5dc081f SHA512 86f65b9384517a04a35dc380a009d0d044aeec73d8a16cb8b54fb97ee13f6940e2166b4b45fc090502d0e18da8ab2463adf22b38ded5008b9060409ee891911b
 EBUILD nextcloud-19.0.8.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2af4f258b11de4a8e22aa8ea6b94584ab734651ec7f7a26e3c9bac43ca2c02b84136d2a269213d3fb577fda5dc081f SHA512 86f65b9384517a04a35dc380a009d0d044aeec73d8a16cb8b54fb97ee13f6940e2166b4b45fc090502d0e18da8ab2463adf22b38ded5008b9060409ee891911b
 EBUILD nextcloud-20.0.4.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2af4f258b11de4a8e22aa8ea6b94584ab734651ec7f7a26e3c9bac43ca2c02b84136d2a269213d3fb577fda5dc081f SHA512 86f65b9384517a04a35dc380a009d0d044aeec73d8a16cb8b54fb97ee13f6940e2166b4b45fc090502d0e18da8ab2463adf22b38ded5008b9060409ee891911b
-EBUILD nextcloud-20.0.5.ebuild 1079 BLAKE2B 1b1b27099da43922c1965f7522f8c8b46e3f09d8539ec02769dc965f0d586e777ba03e90946715bc2bec68e5a83f52eec54fa761247d2cbb5e4cfe05bbb53a26 SHA512 646fcd0d88674b01e86780b167fe2a8979dd99ea2d914b15eecb3f3392a2e5bdbd3edc8ba192cd1262fef3335e684b2c3632de217761c3f7be4e0cd24be81244
+EBUILD nextcloud-20.0.5.ebuild 1078 BLAKE2B 0ee654f01c61ed026136494171d215bb63762edee39d1ed00ae460403462c9186780aa580f58beff98c00baedb69c72337cb941a54d3eef5b5d2ea46413d1d62 SHA512 71630de1135c3c5e5cc9c4b507496010a96786c27f1d16213e75352af0fea3755d7fb81ca033f52fae8f786a73c8594adef707f682bcbea46ae4f1cfdf2b088d
 EBUILD nextcloud-20.0.6.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2af4f258b11de4a8e22aa8ea6b94584ab734651ec7f7a26e3c9bac43ca2c02b84136d2a269213d3fb577fda5dc081f SHA512 86f65b9384517a04a35dc380a009d0d044aeec73d8a16cb8b54fb97ee13f6940e2166b4b45fc090502d0e18da8ab2463adf22b38ded5008b9060409ee891911b
 MISC metadata.xml 475 BLAKE2B 74871cad366634084aef18e597f13073b53e1716ab6d1f8c5fb9e63a3150670167982c60bcae5d8dbada774ba374c686f33dd5eafbd7b0571449ea9a13e0cab0 SHA512 5196408ac6cd288b3989e64ad0a1b3dea869c46377c13ded4b4f0b6e0527825e4036dffdf54230482218b0fa3e1a623463888986d64fad1b997fe35dfde7c302
diff --git a/www-apps/nextcloud/nextcloud-20.0.5.ebuild b/www-apps/nextcloud/nextcloud-20.0.5.ebuild
index efaeffb3451e..7de14adb136e 100644
--- a/www-apps/nextcloud/nextcloud-20.0.5.ebuild
+++ b/www-apps/nextcloud/nextcloud-20.0.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://nextcloud.com/"
 SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
 LICENSE="AGPL-3"
 
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+curl +imagemagick mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 36ed5c073e51..91c7fab47328 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 1966fa6d49b6..ac6bdc32e211 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -101,101 +101,6 @@ DIST firefox-78.7.0esr-vi.xpi 562858 BLAKE2B 9c5e4625800594076fe8dba53585146e5af
 DIST firefox-78.7.0esr-xh.xpi 427839 BLAKE2B baf565d5ba59db99bf340be6066a8b4b7ac45096dc6ef6e0f072f743b429ef24e6e5e6a3ff9d5cbb99544e3940877d9068664f5da43b62e9b684a45645945f76 SHA512 a4e4903db21356bcecf19ae3528bc4db699bd4811267b6fd3f2b5c3ce6d6a22fd30b8034b786b8c616a25671af2c4251dea3ff6af346edf13209fe09bd7a47f5
 DIST firefox-78.7.0esr-zh-CN.xpi 564772 BLAKE2B 94633d16a271194dc7e0560419dfe69aee2a6d884739388f2157e998bb47f53b71343fa52d05df37fe3c6dac0e1686cf096e04455d792bda18f9725e458b9509 SHA512 59c3b040665af760ae6d773c64e1cbce974a022ed47a462461bf7a09cb226bb65b105d714c66f898e3d30066a0f7ef19949e35044a416146c542fd8bd8ea4847
 DIST firefox-78.7.0esr-zh-TW.xpi 564734 BLAKE2B 4484dda1ec861e9f38a465b2fb43c5ef96f2f688350c86a84825dbf6e3656a03391584bcd0f7cff532b77ac5cf6605e59b85b073af801038fe23c0f9e3ff6aa3 SHA512 852481db2a47a48c0c29153aef337e91d70aa0c25854026c76fbb47775d87e96b657555776c3f09f75925044e6ce90f99a419d43c6b4f9e9665b59f0ef49a6e2
-DIST firefox-84.0.2-ach.xpi 461779 BLAKE2B 09ca96b1583846c454cfc3378fda6a60b5fac543fcfc69b0579535af30020272435062f18b56f5437f05b9c3b564717e3c2bf5515d66c1e89e4ca6e8598c4656 SHA512 be1302e69f7f0ded255cb348f74d395a80567b449ba731fbea2a0332df58625dd30445c01b97a2a753719af3d123d6bcbe05fa2390aba94a5c88b6644abccc33
-DIST firefox-84.0.2-af.xpi 429055 BLAKE2B 418471dc76eb251115aee2dbc32229420775aa7318d218a39790a5d715fef72f5e49d2aafc61f38ef00539c969c2549f6ff038fad50829e7b542301a4bf42a45 SHA512 52de79669bcc30ab2f3c42b4c4375b27df36007e5742a67b2bf79e24347272ed4cfba80ce6024682b7c2bdc6c7c12ce20a587d0f5d8669eecdc584ee0550f6fe
-DIST firefox-84.0.2-an.xpi 509109 BLAKE2B fbb28dca915a1309c78d4249891ab13c59c25ae64008e4f21e6aa93818f7a72d5de12c16bcb8145864a15772cca8a08ad5aa5fb8327cd89206028d282ee21b22 SHA512 e805aa7dcefe4170278344471e90450e157819596c6ef9beade028c2b03d021a6cadb2d5986ce447167d8cc8dea1292e7e205314bc8bf8e1f363e91d0cd5dd82
-DIST firefox-84.0.2-ar.xpi 560417 BLAKE2B dbd28e1b29303209e4dbed05c5dd688a75e7e2a6416ddc111566734a44583343b7f1183e74341956ef5eb7892fb6a6bfb680180562825ff749a8842de772061f SHA512 b08f51626d11525b7d574d82d34e5fce19b507252f26b97537522adfe11e22f6f982680e488fc8e76c2aa33c820da4d51895eb5b019f5a4f846796209f3ddbdf
-DIST firefox-84.0.2-ast.xpi 457477 BLAKE2B e29bc796f15a1ab9a067b88f6d6ea7134fb3a428b828fcee2bfa866876033a4629eb63f310794cbfab21799af2a781471eb833290247f91443d22f87fd219d90 SHA512 ead73901b996ee133c5ba20fdc40bd8437be20a35f3c4d52d5e9a65a6b29f31bf906ca2896beb072c331d2c94c7af2372af90059dfa80a51e94a7dff213dcf62
-DIST firefox-84.0.2-az.xpi 498631 BLAKE2B 06a552f7457895e4ed6ea197e32efde87b2a26586c9484dbb10b12a58f58c48ac1ea57a3f428e6ce0f90ce87de0dc2c625c78c57d98eaeefa37dc397e07f8d39 SHA512 6135b9fc9a0b83330cc0504559f014978542749138c7b1ac8e17a807e64ccf522a1390248944c1225510520f489293254d276d60e939df68ea4d3c31ecef0976
-DIST firefox-84.0.2-be.xpi 606507 BLAKE2B ce33dc06a3f3388cf2e6990cf4f3d60fbb61dcaceb81fc9bfc579a39459ee1336cfb512de1ce772ddf0afc675601105b5808f5eb80da3f314ed48341f781531a SHA512 72b2b738c471fcdd3064e003545505384bc6c2222beab1c4fd67839b50486309adf57aaf329f5acf7c5bfd5a3d21ff8b2c8b95d58024580875227453b0ee7494
-DIST firefox-84.0.2-bg.xpi 556435 BLAKE2B 96cd7091d9996f8ddbd0f786614e4dff232690833a9a91d6353882b6e3bfe9dae5f04d5416b4067168875e15dd70773b7d45be2193c447f913408f51ffbf409f SHA512 d5fb1c1d2006a936e973e58d2132621cf3c795541f90135c35a06b540396d1fdf36d2448a46bc689fb032cad0edc9f2472abf993246ed8bd4f20409926a0704b
-DIST firefox-84.0.2-bn.xpi 573373 BLAKE2B 4cc42d9899fe0fa0c249a5811e64f11a44641d587b3ff79e384718f512f0156c7f65a417eb3805916db2f1cf89159a54cd7e5c2be376056abe014d8e085bed7f SHA512 ca1801a8ec1f8f6b15d899df17aca00c09b03b077d4c3878e4f97d3a2f9a2d817c3e4b72243d26582790691dbca463062549c6b4e465c6ebcbc71efca6411277
-DIST firefox-84.0.2-br.xpi 514058 BLAKE2B 215e032f105bb81fb67801e7936bf295d0f174982dfb0b637d0fe071c72c0e2f726d1d0f3e1f55302e1411873963760cc2193e8f5bfeaaa78b87185a703c0dd0 SHA512 7065e2af1b9baf5c343811230aef6b17040631da2d8334a6ee13d8020a1ced542ebf0cedc08d66bcbc8fdedaa8af0b3aafa92d2b3dfb98a64aced524f74308d9
-DIST firefox-84.0.2-bs.xpi 465252 BLAKE2B 5d8d9fb3d26328d7e2719f07270d06f74e8f285268eee40454c97104a02674fcb5bc601aec1d01c9f20cd782260ee221f394b5ccd5b321327181f3084493a292 SHA512 f3abf9f8e1d3a0266f4e2be863643f76f736204452a86cbc847c45a59004213dfe3a3503719dc3a5098dc8496e4ce97076e4b12dbc76168c96f4c6881687f39c
-DIST firefox-84.0.2-ca-valencia.xpi 518017 BLAKE2B f990bf8dcdd5d0eca17b428a7ecaab93e59354292a611c57a51c2bdf44697a55699d30bd16b0cad5a36d988c7d272f2e37ac223643320333b02ac3a74a95fc14 SHA512 3e432c20ca3b1a7bb2b4846ca220877110a7928345b62d3d37a32d958507f006ecb6f44e5172d162b63361269fa9442421a7c0e31bcf79378f08601aa7e7562f
-DIST firefox-84.0.2-ca.xpi 516045 BLAKE2B 8beb1d13549b2d278e32b148738bc29a94913992d24b08718bf98966614d80855b7a410d0be99ac44d905aa42bf01a55f9309481a27b40de14046167831a3176 SHA512 37f3a98d3092825e4aece5af1621b2fb1f145cf2137f213790bcb1b52605470f5b6b38f8b6aadd654060f4887e37711fc41462681a99f0cf612aa199b02d9a72
-DIST firefox-84.0.2-cak.xpi 549485 BLAKE2B 76c420cf01a0e4c9d38d5396ecec08e5b4cf9dfb17dea2d7a5835b51556ffaff88b0bb34303ce0870f54f3ef16664a845065d753d7a92b05bdbe5e0c9c0c4075 SHA512 98ad2589f34c020fdd6100409069f67313acfb3ac8079ec01f1322d8586cf5229a71077b9343e6878547e421b74deeb0c3c69e297ad1ffd9a62c78ad4fce9a1b
-DIST firefox-84.0.2-cs.xpi 540236 BLAKE2B 6bc88d58df741509806b09022f453d67e221e05335224576e66e7da0cff00e0e28cc140ea699d73609abffa2ebcb43e45f6dd03a4675c57f2ea3d2b4278f1af0 SHA512 233812418d71e2a73e4590d69d18b8eee9a5910790222c0e31248872ca1cfff40b3eecdb593785b3d7ddf028a851267be027387ec15405c76cc176500e9c909d
-DIST firefox-84.0.2-cy.xpi 528801 BLAKE2B 52fb19de2f76ca32d7564d34250c0fc749293a6cca388a37d9caf4d437a5735f76d755a4acf5372521a713820c8f69335eafe1bb840cf63fa30c5e9599af4146 SHA512 294d03569417db9120e912a1bd966f97e7220cf564d72cb30ec5ed5c20b1b4bc3aa08ab6e97a8fa43ee9546d5cb0c22bade3dc443fb39382e4df54b29923c438
-DIST firefox-84.0.2-da.xpi 520971 BLAKE2B 0e71c5352d13c795fd5c6e6e21079f5a2697aadb533f0c54246fe5e0577cd561b697116373bc3ff2a523cadfddc39ca43fad7b44c7e5039c3675c831ad734960 SHA512 3acb0e370d2706edde3929e9e770348fd9f804de6bbd81113f2d1d538a819d8d8665527506e8d12d7b095a10742c3d1477b8204d47a406282e71dc2540635eb8
-DIST firefox-84.0.2-de.xpi 540875 BLAKE2B c11238cc731beb34e38f460aef4361e78d09c22c6a691402105c5a6358d9f16f648484cce70fc47859cc25ee05ca9e8cb4a1f4a7b714ef192d571fb960e84997 SHA512 b3218266714d9a1eb34b3521eb5695877bb1ba661a915b8db6ff06ca1e2731b884ad81e1d748dfa6460e51af28c17840ebd26cabd81eb41fd2d31ca68c84b49f
-DIST firefox-84.0.2-dsb.xpi 552207 BLAKE2B 0c8789a6992f66c3ad66fb90dc2aeb5507c49cb85594bc9771a715ec9ea825666fb9cb7d63341a00de621314b5e025ddf358b805352e4dbb851e526dab8ee073 SHA512 4dfd55995ace0a0c1056342449635956d61202fb1075c239174e2b7d1cd56cae661b1cd6cfbbe92c24aa234064b3b4631c0ce187434c006689afb86374d3139d
-DIST firefox-84.0.2-el.xpi 623767 BLAKE2B a4a4112fd94d91b70a8ed388123b78d8d23756e60ebd5d774f5c0ec4c619b656bf502f8a6e654707963ebae0fb57259681fedb54337ce9c7fc06214ae9eaf9b1 SHA512 ca0b7dd470bdfcdff064b15b2a0ea650d8032ad516ee7c798245b1ca25920aeff410c4dd26e38f5fdf747030201a55ffb5197a11a09c7022e33d94502dd95fed
-DIST firefox-84.0.2-en-CA.xpi 495292 BLAKE2B bd8ef98ff4fc76941270bf76794d26dabd6699f4ed3a5c09d1dcce74e8e5d944f45acbd258a4e8de4a990562f051bd572c7183c3a6452a61744f8e045dea927e SHA512 c4e057233e91bae15b4e3838114a74309909c3f154764882245717dccbde17b74b5ebd33833e169b12d4aa67f5eff2cba951598be16ecf241b570a4524b5dc77
-DIST firefox-84.0.2-en-GB.xpi 498699 BLAKE2B 3e1a910460b1a07d75e7557a3d2a8284ba425873f5f10a4cd6e24fc98ee10af9df637f043f1dc781416900bf81b666e97f556598acdf4731359faccf08955ecc SHA512 4ffa546598861d50c328ab332f0f119a32ed637c8a354b11a4db7e3897735ec824fa4be1692683b8f4bbb81a35283f19b86276079d50904a95529c879c0bf838
-DIST firefox-84.0.2-eo.xpi 523253 BLAKE2B 075f8e7b77d60362b609171c1537cf5c43d83dde9241ed3778cc99bdccce91131eba3cc43263fcbc9f30deb1a7d2f380aa403f2f09503758660f036fa04cd22a SHA512 7e100f56d9b630c065365bb4300c039d570a071066f1a0c582da0f7ccff61fe5b0fcab65c82eb2ed1c6ddf36785024be607ca45d800659a8c5a62937740c9732
-DIST firefox-84.0.2-es-AR.xpi 533690 BLAKE2B 05939866663e2fea8e1bf2b083ee59dee2d454ef354fc6c0f0205bf01988b4b0d94a3a2edc24c29c27f342782941d2a19ebd0421c94d8363380a1126a12a4ab6 SHA512 fbbf9583e7c758daeaf6dcd46e6fe3ea85063981c3454094eb27f6b8ab7c8939d867ff95b589e53583ef450153e756db16a3169300d5001a0a32419b156bfb7b
-DIST firefox-84.0.2-es-CL.xpi 533180 BLAKE2B 19ab6fc24a6ebd22fce83f5edc3d3e6a5fa4981dc7cce2fab1a6d5cb1a4415c9e51b268192b82763f828b8e801cd86a32e44fcf1dfa3980cc7c7fe1ddf9dab4b SHA512 294fd39dcd9f28b1f451ecfd8aa011af9cb7103079ca24f45e226fd7b20bbe44f82d0a0bac47cc4297348f4b8133be7b110e7922bd52c4afe623764b768d7dd5
-DIST firefox-84.0.2-es-ES.xpi 523075 BLAKE2B 96cb9dd89363913c4433d2949e01503812d0d8406c6cb401e3e9ad9fc9591512115e73e1f3bd99af678994ea5766b9c9d56513db80e5c0b5d3ca46707992c9ae SHA512 3fc613afc4641b6f80ac7e2b0d1c40afcdb5ed3519fe6a55b90d1cc35ec9e8e3936803309b0c377d784f6f93a932309a492fe5463ba75b8f62d2942a3c66f6d3
-DIST firefox-84.0.2-es-MX.xpi 531350 BLAKE2B 733676fdff7b146ac83cce7a8af2e5dda2e88c7e44a39acd534eee66edf753f493eaef6d9cf6b870e296560c87f9edfdc3af91164b4b68810cf1ec8a770e7661 SHA512 b88543f7a1c99358cd4311da7f379d01bb1b9e7b11a937715d6698e74c1ab1e4ab90208945c9584dfb0788d2146528ffb91cfc9b966f26bcf05e7de0cbc6cf50
-DIST firefox-84.0.2-et.xpi 486949 BLAKE2B 9b54cd24bd8623efef4c0c81ba1a79372d7ade44393f7402c4fcc8eee544f545f02fc2038ec95ce7ca7f1c8ec617361f9e40797619b498fb221dbcd022826b39 SHA512 6cbb204a36a6640b2c72120e265e148b7e902f0bd10fedb4d2f21513eea1a1745bdc706c7bfe03c8c90f929d38bdcaabcc64d72f94be4c9a5c6be77c6893cd5d
-DIST firefox-84.0.2-eu.xpi 515144 BLAKE2B 62428aab86fcf465808391da7db601ebcfe6c93700a6e7ae755e3ebb60a8b127927e0128449a30fd6d31f20ea8260f55c8811184d56c35ad23e94855fd9242bb SHA512 85acc823da4f9c322f1f488f930920c3d1107f906fab151472d7152dd1fde41cfe79c3abc2fc51b49419a37c6d8a75334745ff9a92bec6846b05efa5e90cc085
-DIST firefox-84.0.2-fa.xpi 539667 BLAKE2B f31f9f93dae37a45b628913783b2c5c914d120db81f4f3dd930e192137c1dfd3fe067410b8b1a53021eb2b73528130a1ef9d395c946133a85a1014f7db23a510 SHA512 b294ddf12aa2bdb85ef64215b5ec05e65c2e871dcbb56890caa051957dc35e4dcf3b01e96e43abd79cd30d22eb433e9e2c482c441344962fe1ab90c560b9c0ca
-DIST firefox-84.0.2-ff.xpi 483210 BLAKE2B 24eab999855fc8c9d5d94c17d606e26d8ac4c1579b4f2d07a4a7d851af51231943ed3c7ad6ce20b3bd0b2e08a7c0d81ed578676c4ed0244bc82ee84348622cd7 SHA512 acc94612b587027648a351628fcb3ad4ff222f1139899ca454ac6bd59c92b2f41323785d8c3afed0ebd9ed7bf514cf08a41bb41bc0dd17d6d34f6d9da04b01c1
-DIST firefox-84.0.2-fi.xpi 520035 BLAKE2B b0743f033f1a66c2b73dac1ebf3014203bf7097f5156372f43dd69ead1e7c51b5c44405cad8e848336d5ed1cda7416c95a819de56623858b983a05c69a13ad8c SHA512 9c23265605508f983a77bd10fcb1191c17fb401f78516e948dcb60b5ffd1775e9a85126802c81358edfa71cc1ddba3929d15a89ab934a1b85e598175ab78893b
-DIST firefox-84.0.2-fr.xpi 544373 BLAKE2B a00fff2f41a2b2c52a435ae612a8dd472012d66522a421111ac24770e72acfce98b779f57baf1044e6dd558363919adfd9f58dc81ce33ea6126272aa434aedc8 SHA512 b699787492e7f8bfa77a6813b01721018fddbe2c16fc8b1c02ecd923fab40a6dd7875e56bf3fbff56865f7e26b52e54e50b27e1a6c7545608018ffc793fbc7ed
-DIST firefox-84.0.2-fy-NL.xpi 530312 BLAKE2B da851cd97e1404108d9e97ba82d53562a88ee93366644ab8fda12b3fb057b5f0b13a5d77dd00a5152699a2cd3d4b87759f1a092f169b0de2b37966765f244238 SHA512 203a4de835df4e840c1807317f770855a3afc82a79547c0d10274dbe0b659ced3d9aa730e0e4540b40fcedb372c6a7e04017f50e43e7bd84c975b2d1405010bb
-DIST firefox-84.0.2-ga-IE.xpi 468070 BLAKE2B 632a37bd9fc2ad26911d0b64117c4a0a8c6b13c83b818785269f1ba105d6ea167a2888615c5fce325dd092d870c588919259fcd5c85e7bf2e3aa2c148ff8852d SHA512 57810fa116f979405669481414a2f47cf7da7f287b66abb57787835e568bfca8aab02eec2e4474fb6b6613660fd2811aee9a1562fda414bd8dab3796643d0392
-DIST firefox-84.0.2-gd.xpi 493499 BLAKE2B de77ec5a37f55630d5d4a37c01ad14f7df9560cb0c753f99ac79797884be12819576b596ea44e826edbdf2ad8485f7295134c947e50d40ffe71dfe142c3bb823 SHA512 38d72a253b4bea039777fd519535286e4a43ab4972d3d611a36fe2b84e9deff7a2fcb82a8c77732e92f762ae0189ed59d3c8135e370b017a77bcf875dbdeb37c
-DIST firefox-84.0.2-gl.xpi 525656 BLAKE2B d9c751b6e1f44ce5c1e3207df1dea23eda200ba383375a8e3c670554f0ccb771c0016f6c5c4e0b5e0e509dee4516b78d6e48a8d9f64aaa3fea6c31d99f4cdb06 SHA512 833b975951ba1630b3b4da4c3a02026a0a7761cdab82c816cd3e0048afa3e4032dfd14c3d08ef5a1e01cf4434aaed342cb8ae84de2b6a55fe33bc782b2eddaa4
-DIST firefox-84.0.2-gn.xpi 544449 BLAKE2B 824e9497c0d87536380dd1c2f73f48f72b881aca1a3637433a98d2bbd9d12d059cdc7cdd35e66fd2c2209227da4845b121d987ef336a6b6d5ea2eb8f2d328bca SHA512 2efd64d0b34c66e55f60cf4b98f9c0c14dfdbe687e442abff59234988b0abe975b825042dcb2b7bd3381b1480134ed68b1924021b1a79931feb9335977092207
-DIST firefox-84.0.2-gu-IN.xpi 542131 BLAKE2B e56d1c7486e6324c80bc09229d7c1533f76cc28b5f187a3594366dd8539337360d5e3d2d46472ebaff8318aee2c0960bcd55ff7bb44786c5d9ae9acfb9ffeafe SHA512 4b89d9bf3095eaf1a6de539b6e7c523720f3810c2ae6d3e6418055d4ab2dbb11af1d4f02d3c2523967c2a08322f35e3defab1e10fd5c97e8f1583a2a807b2ec0
-DIST firefox-84.0.2-he.xpi 545453 BLAKE2B 88cf79329ea2d9e9414ea3acc6dccafe7fe5fa72993e3972bf220e710d51fffaf2b69448381b8047e28a205b07abbcf0c122a648561b59a4090f6bba62f5fa12 SHA512 d4ee28bf0f3f0926c157bde484133c704490c4cf9daa649914cb3c1b5190f3668ca939ca11e1967c02a4e336deced96e68dd2e01c41c07df7d0829f97b277c1e
-DIST firefox-84.0.2-hi-IN.xpi 568115 BLAKE2B 3b9628f231fd9ce25e1aa343779082b65f81904738386bc8361929fa96426b9462c27169427343b5f6b9777d429ddb91ad94f03e211e37a69d3a4fb1c5d1fe31 SHA512 187ba18ae7c5e0abae95ce129eb3e5642bc3f683e330b629d4182d0616b65d4637a6d4a179ad7a81caf5ba72413348d38fa15abb6a8aaa9ee6199563d3735f3f
-DIST firefox-84.0.2-hr.xpi 521273 BLAKE2B 52ef352eb8f4188299084e470c58fce7361709c0ffbaa5891c85e3e52173cc3bac7db731270ebef714da621b0b57ccc64b1f52f34a512a93523e1c6d04f5ad1d SHA512 58f837ae01e85f2176b01ec909f7fc9250b6fc01b7f49c936653f44f4641e2feb5548836f09b1f95b001ed9e834938e9c8ba7ae2e32e372d10e8c9efbf89383e
-DIST firefox-84.0.2-hsb.xpi 548613 BLAKE2B 432678e15c084bcc3eed408601d4a8977c36f8095fbebaec23290403e2f06d87fb18ab6dc9e5c79f5bd96050016292ca63ee236466f01acd37204c0546b1af8c SHA512 9b566c07fa9cbc93961b70ec320b2ddc74a407f6c31b2da9acd41716055be1f73c055ee83d5d3e2051b898dca9804329ecba3fe6eb0af7b5508573b4aa142a11
-DIST firefox-84.0.2-hu.xpi 552382 BLAKE2B 0f3fa98dd3ca0b5c48f308db88d39d8487843a01195b4ee6c93291894ded5b5345b4dbdbd594c028716bf050317c7ba2c62882acc739e07b322224bfdb2bbcad SHA512 920aef72bc2e3a0476fe2532424fe5d9612822371119da9556b1cb885b1a1e7e04f66e3efbaf6ad89916e16c95d202a801e293af04c86f3e4a5b9e0a279998aa
-DIST firefox-84.0.2-hy-AM.xpi 588506 BLAKE2B 42df3184fd5c15c8e2c1beb28817679ff962d596d4260a239f74da498ecdec2622d762d62dc65a40e13ca82b1e199bb1a3e1ba1378c9c98c37ca5ca40c4979d5 SHA512 d995fe892e733a0ba065f3964d8a46effd44b326e76d3640dc9b9208154878bc3b3231641570af5d2bceff84f13e5d299a494b9740a13f0d9674d4cb8d4cba0b
-DIST firefox-84.0.2-ia.xpi 519834 BLAKE2B ec2edbb4e0c2bafcf8d0839b3179a44236efa68559521691250ae608d67f711416489cde558d867fba7ddac68019e87696e9beeacf8692bb135a4e3a9723e511 SHA512 fd54800ea61eefe9ed2905443be9b204056a9bb38ab181596cdb817ef21e5ae9d67b8ebd18490d885c8e1ca2f803454a41ea9f9d42047b234c4fd9e88e63f735
-DIST firefox-84.0.2-id.xpi 508530 BLAKE2B 8f63bc80ab42b1496fd6fc645c21fe38e6cefb0306f7194e7fbee3bc4c1f61732ca15112a737d6c0c2ac2edd172c206ef7c222f236ab267587e746530912d75a SHA512 2f7aa3ba86d41f36f2963dd4fb2c6bf9155c77c4a43f558ce7d4d490cfc5c34ca15257b5f00f21f454ce89e8b18964610aaf6c2bf7bd00900d5cfe3740e39bb3
-DIST firefox-84.0.2-is.xpi 478792 BLAKE2B baa7e91d12fb31e698e6238467f0651245522c66039b2b76d9f83ccd278507b92cd33d1741b3d28f877761b6577c75e42377f72bfefbe31ee2584c3851da9c61 SHA512 cc1433e30de1de5ea35510dfed631602ba25dce604d2ccbc339ed3f3618522a3841977701b4d5655b1a19b058664f8f5d629b8a70ae34b64923b43d9e4357e52
-DIST firefox-84.0.2-it.xpi 448149 BLAKE2B 919d5b523a1511019507359a210fa805f744c94b2b70eca277005a9b19ec193ddc4e1861f5f0821c9927f03d9e36b2930e8b0a6983e59fc6beccc6b556eeb46c SHA512 76663a6d7cd83d362c42b719fb06cfbd6c6835cd88aff1578f694757ecd1ad8a2a9222ec401197a31ad00db434154fea0e9d8126dbc976e0485d90d3a5469b44
-DIST firefox-84.0.2-ja.xpi 578208 BLAKE2B 9ae19af018139d7dbaf658ce6299b45d1861587c67aa0f5d56b1330a4a61d216af1cffabc0aa53cd9b53f383f1723a4f84601e0e69e588ae97121c348a544778 SHA512 8336df382e58df174eebfa07575c8b4cf0adee74c20adc55d1e434dbc4981ced9ecb4977b28d8e8a65e441b746cbbd535281e0895daf98f174a41f1e45d3debe
-DIST firefox-84.0.2-ka.xpi 579048 BLAKE2B b12582ed5f4dae5dc267cd647d0be185f1bee8ada896a16fbeeeaadf1570586013584fea9efd6ef5d7aaead51f037a9bf35da61ed1f6c01c5b1d4ba49a4beb6a SHA512 785c1405e7c004395af7aa092c2c81d15199a933ba823ecc42441d027c9c74ffeb1bee19a848af00f9a38624d1a08baa5a6d7a8221d6b0d620e8bcfba45a9437
-DIST firefox-84.0.2-kab.xpi 538420 BLAKE2B beaf6433b84df150f6bd11264ce256df82fed43b6558f15bc38cf8f34c4d1c080183e49a90b7dd717778452c723a64ac0e27cb6c12f92b95a7b37e952e5cc18f SHA512 ec9724f681d0cca783ef50f7ffef3e1a34e2fd3694931bc09a6adca7c1904045c5afd4966a88f32dab41fcead09e1e91fae7c41bb6bd6dc1a22dcca8023e6bd7
-DIST firefox-84.0.2-kk.xpi 591074 BLAKE2B 07f4f45600822ce84bd07b77a2cb2a53f72c9726d8b707b0f04b753f7f895caa5fb506af248de3e5bba6319f078da0a50e5b3b51601d162129f08cc7ef274e1c SHA512 586030e044290fc843bfd236917b35ab838ae9dac82a44e8ac9db625736561baefb68c03547e0fe23e8a4738def7175a2b6f2253a021cdbcfa37b0ce934ee4a4
-DIST firefox-84.0.2-km.xpi 527421 BLAKE2B 94daf5b55d3e1c92c15de923980e67657a4277b6cfb2f2e05454c0ee351409a5c240294f05b418821b277da6aeba39d147ed968e2f42b6c2b46364c1d8e6bd94 SHA512 0e74aac4a0b0360c0c4ee05a336c7d38b3525b0c3316f5ae40dd37c8b75273fb3cfc4dd227268c1aa1630c9371717960ef4063b3c3ab32e0e4cb3d1c1e169302
-DIST firefox-84.0.2-kn.xpi 506722 BLAKE2B bc64f458b047a77136804d91528bee7d02943191cb0719cf93e509c126d60c8fc4feef26b3ee2dfe44c1790c02efda267bcf93181059353fe1a166e0f3f303ce SHA512 4db1eeb88f7ce3857db4b92f803c4bfee2f63b00e2f7f6b8531384fce2c96f91e398f94319d41d694794c91559e75774e27b68b667558240a7c1aa61542fdf9a
-DIST firefox-84.0.2-ko.xpi 564756 BLAKE2B 02c3cb7e643cd15440e4e89c3e46c409f1b3033fac60fc26758f05e22b9f8d510911dfe389a2ccbfb3e86b22984d17572dae5e2e648d1b78f7c6e5b9d6ce6bbd SHA512 3e9513e0a05534cb0ff9ac2201ac1c2f28ee86c2a6fb73cdcef2a785cbbd7b51d1bb5747bc3b3382b6dd194460e9bc733933a2978697dfe5b50f2fe6f1394922
-DIST firefox-84.0.2-lij.xpi 476798 BLAKE2B 7cbb8cce2dc762a3d61474d6752cb12e4f0a2bb7cfbeb41be6c51ee5418a870e0cd8b03977e57f00bdfef00c7f6866ad28b97d664c2c163d2396830ce5d34c53 SHA512 be86dbdba51d143a8b56cde7ed39e7ea101a52d2b8dc5ea14dc1e135ba693b8dda6be0157bff90ef539b3a2bdfd74d01f65b3b209001f0626ad1b8562fe67f4a
-DIST firefox-84.0.2-lt.xpi 547540 BLAKE2B d7d0f09d8e4fff6518ff44e54df9fc9dcfffc8ab0576ef1ce691546b747f6e4f236b64e1b2758a7b42090d02ea5dabd62eb1977a51f80b1d5a7f830ced27e26f SHA512 f68b00eb135780593d403d80cb361bf720522dd80de722ed3ceab2879309cb74767c2333971ec71ef758b245b0f492eb0244a5f57b2ce37e86c22bde7fba8b7c
-DIST firefox-84.0.2-lv.xpi 470844 BLAKE2B 2aa799cb912efec64f2e4e2f0d99bdb7118934e3c3acfb6954fb96785aa0a0421c34c67b366320c53a2d6e9084f25f8ab62f736e0bfa6625fdf22ac8c075aea9 SHA512 72a6a64989e9a1b9459c99fef70ad7f689912853ec96bab5bb3228cf30580afddb81180dd876af6ea8766e1e4d8213c3368d8baeae7ec1c40eb69f2429c71ff7
-DIST firefox-84.0.2-mk.xpi 459831 BLAKE2B bbf84fbc9cefbbae8c30896a20c13c827d9bcb5e3924344752acc88df1afb6dfdd2793ee74d1a43f0a609b24efd6d2be65db441807edef321b9b5ec7e2644048 SHA512 9f7697c9d5d63b7a48733e2a10560d121954151b245d33360770bafbb87560e031a14d2881107a8d2fb1e11aea7e765491bbade58d9053aa9339843012b8ea82
-DIST firefox-84.0.2-mr.xpi 541982 BLAKE2B 518302ecb9f774f73d5b8e52a22fb006fc53569c2cbdd7a4f8ef76b650d8dafe7f77f44fd5c77fc7396aced1d8455fe5186dc70b88bda51b264ef2a21a4b4965 SHA512 e1bbb89f794c7ab8cbd17ccfa7da4f0de0d85983e911ef27347995ecda4672438da8f8d171e48ee60f4e99808f748b3e994304389eb137383921371a5a204c13
-DIST firefox-84.0.2-ms.xpi 454820 BLAKE2B 340cd72d2d1e48377fc820d579182b7602c60644e5227d64ffec6e89aedc92590dc5a5ea73a1c682ea9f1ad3b2dae5b28e3ecd04eae09b2567016f27de93f82c SHA512 8ccaaad2068e2ed427dc6a28fc4a794ab2fd382f0769cb70b7748feb634df16d6ae31afe6149f1c5494024422720a9cbb7de9ddef88024ebd316492047f91b99
-DIST firefox-84.0.2-my.xpi 526525 BLAKE2B 1d80978d0818e7b2c50f42d6688fa2617e24cbc61280152dc8553c9e77a5524af15fe3da5b27f1dc1a1dee7d89fe25078620e4c133721f011b4a06ba2162203c SHA512 fa1843eb90a107c35c8488618cf33ab1cb8a189739cd1bfe8f6ba37cbfa93e3f856ce16bc2a33075814abf5e5d584f41ac4c0d97916c2320c9a0c973c73f84ce
-DIST firefox-84.0.2-nb-NO.xpi 516936 BLAKE2B 2fe9798c3f4bd38f8bc713f4ffaab1eb8ffd29575260c28307fe65895f1e9f3688891881e6148c7057c6fe69771afb01db4b350af4424bb86f3a803aa0fa0c01 SHA512 8bdc88760db34517f67643c143430887981ea0bab807b0e0d70a3e838119669caefdb3e8ee4edd8196c13b875263ddd27ca63e9c33ade24c7d94331797aea19b
-DIST firefox-84.0.2-ne-NP.xpi 483427 BLAKE2B cb9305c4261c7cadc846b26e47dea132213c83f819f189220c7f44e6e3436f58a9ec09ad5f9abf7272a24f0ab70dd26f559ec2c916ca4dd6f7528f25da41f667 SHA512 f532b958edce98b6f41eb895048b5819f29057b7c07b11d1cf4b878e57ef94237fd36595dee5151d87234419060627bf16d8bdd430c2048613faca9abf07df43
-DIST firefox-84.0.2-nl.xpi 524176 BLAKE2B d9061179cf4496cb4fa92a233572825d551a4e65eebffea009a486715873f156b9da70908601276251fac27700190b0040b16ae67ee06e6bc09d4c155295bb4c SHA512 a692962353ad747c2cb8833c064b1cd7d112ab20f43d77953e71934b20d74ac0edddb282cf3163dc5d44bf5862b7352ec2c108144124557b8f035a5311166038
-DIST firefox-84.0.2-nn-NO.xpi 517877 BLAKE2B 9067ce22390d52489b602274cfcc0f3996a8f5807ab0fa7e97f032541ef967ef3ea69c7d26f16de40fcbcf6a0e647478b4cb0703c9dbf759f057c5444949f0a6 SHA512 6d43a5afe2bd93c36603539e6cccc215c3be2fd05e1c72572e512ffb7d56fdc0a5b4cdbea677a3464877ae766ace1c2dd9875acace3b036cea13536213a4b39d
-DIST firefox-84.0.2-oc.xpi 540042 BLAKE2B 59f24c9012413d773695cbb41766b578345e1e97850ace3be615eeab747ee9d6e2dc8bfc780e5aa7b6fac07d98e181fd30d6d990b6a78e6dc0ee92e9a9301cb4 SHA512 6f630dc57236817f2f1c96e5fe7d209cfda3ee577ffced37548e06d5e9e2c32f6841934b97a48bdc5bc9124522c34bbc4b89cb5237ea885ffff4fcf8bfb42738
-DIST firefox-84.0.2-pa-IN.xpi 584966 BLAKE2B 6299b7d1f69709395a78df5416e128a0408ee363ac929f703865c5883f33e4cdb520a794499b0c10437f6417e96dd52a5865e824607a685c043e5e9ac3deaff5 SHA512 6844017ff5522464329238fe959a60944b63ae856b168d493cbff3eea4e867cd9958e139b891b9f015aac068473b7333a1fb4f9d79de8976606a5e18324aba04
-DIST firefox-84.0.2-pl.xpi 543365 BLAKE2B d226056f838780409df3864e6e607db48260d5a79f0a067d09aa9b572cc4b5179dbd0cbc7bfbaabf57d0b6d925205541beef9823c5bfe17a6a65c238cf51d236 SHA512 a2fdae90b0fdd95ef3d2c732c829af23dbe40eae2fb822b293101ced541becf0104384ec10d5af4200c57b52dcada25ec8511e88e43c2b78d9dc10e139b99048
-DIST firefox-84.0.2-pt-BR.xpi 525584 BLAKE2B 06b0b61f6c358a426b67d63aaa6e938b5bf8cd91a92cc8c91eafbf3b78fee07d6902d916688aa4dd7e2fb2b28f7343b4d97176b2aa8dcea704e525fdb473221e SHA512 a84d1da0484155925d02e73e3d329d865ee56645bf4fcbd3dbdd2ee632c946350fe7bb6864f38dd36e310764857105ae862ddef0ab5ccc9b61244b2506b272bf
-DIST firefox-84.0.2-pt-PT.xpi 533302 BLAKE2B 9e59349329aec7d824662b2de90ea3b18a255941853b8d8f0d8619a079f5fb87fbfbdb5a245ffbb9f1af78aa990c9bbcac9e3f79b4bb7bc828251cfbaf567e7c SHA512 37d457000660c5a8d2b95bce9217b91ec38a240daf6c939e5afd2668ffbbd8ad4373e6cb49780212de23f26431581b9c971452634c4d49c3092ed4f2f64949ae
-DIST firefox-84.0.2-rm.xpi 524836 BLAKE2B 25afb490084157e1e45cf33135ba5a481047923cd899e91d144e12be0778a8dad74ff9d280b7cdda832debbc78c3922081b3486c21e51b3f11a4b5f075e7df22 SHA512 eb1dc215981fdcb3cee90f857fd16636aa1d20268a11c567353881a823a0a4bd151827b6cf2cf04ab194a2f470b6881865d5ea991e956a1898fc9a4c133aef76
-DIST firefox-84.0.2-ro.xpi 532974 BLAKE2B 6c0463476f0ab94919da8f4395ef73023c579d03be0db002c8b3d6cf64d0f8fa2360866a619eea93e6b4882d7b700989596c8ea915f0f2cc6fb96188c8f2b73f SHA512 bd1c9428a83395a40d03cf15f9af741aebee56fea855ca3f13ac480c93782566e9a21e3cbf5e69491e25b8b183f4be158f1eee4eee8aa9582a9fde6a770a6c56
-DIST firefox-84.0.2-ru.xpi 611905 BLAKE2B bca4adfff05114d9b6c832558dc6e21bac78133ab9c7f154589c18fa1454e22bca5c7fd807c9c4abca4e04757f293469275b64bed2a29669c40e336815a8f12f SHA512 eb96a3f183173928fa9186d35095c653c9dfeaa0805c1d9b02e972241bcc426e34f6dada73b508541a11225bddecd90f58ec032a022e4c585bce4bb148f85c3e
-DIST firefox-84.0.2-si.xpi 492925 BLAKE2B d26571324881fb460d956dc817fe6eb096188f852bc154ca2f350256fcca3971bb27ad5d41e09edb8d6f6c2559262253088dac879a57ad118d3f9cc1afc41acb SHA512 f1176bbef031af9fb137d2be3473474e6ce46e5f388df2d32f0ff84a814a959bc968b1523baa52a1ce75335dd53736518f7fbfc0b83ce76f90014d72b77aac3c
-DIST firefox-84.0.2-sk.xpi 538504 BLAKE2B f10eb835bdbf9d36001d74647683debffc09e785ceeec629d477556b47f0aa257054461c547054b30e410a476d5762edaacf3ff2c9c5eae1491813fa3f92cbb2 SHA512 8d61fcae369ee72c046636e48edf37fc523c54d350c2494b2a4946578123b03ce301d11e696b90817851d63ab49c90f9cd9ba801db4313f389303e16179b3e61
-DIST firefox-84.0.2-sl.xpi 521135 BLAKE2B 86cc4a9f6bee4e45249a8f9cbc8ef38296b8981691216af1cfcca0adff8e1887ba482a730e00f8e9e2048b7b666b6798449be8886a471bafd321200372b2029f SHA512 a96d30bd538d42ce755381e3a6f4df0f34cc624c197707b9ff23de56d60f97cce6d07523d43f28399551f4a1bc99a648e2fee6f4c6cd337dc86ec9f827770f1d
-DIST firefox-84.0.2-son.xpi 425695 BLAKE2B b6bb992ebb2b7bb178d45ab1b14d9a86401df6fce469e72fa141c8e3043615223e0255ee2ecedead4efe4f7d14a791009c5d8aa212d4791f30d60b81c8717249 SHA512 9df3e8c86b599797b902db9a9f80fdfb00d93cf1b54d99019745e8681383ef02f4114cb71a53bd50f5cf7c93762b3e477f08087b80f7a2aca931b47e6583d12e
-DIST firefox-84.0.2-sq.xpi 542777 BLAKE2B 6f9897cc83fa929deeeb82e2d13e1107d62aa5f0ecf214e3a653b6aa1902dc869f838a67681fd5cda8227c12f40c09b8f79a74044ef3ae42e52e7661a949f1ad SHA512 2aee453c23d891940caac01d40a64093f1d801fc8c0ee06789c22ce2b32b9b6a941f4c561d293849c3c9a48c085d102c93716a78a57c7f62d1bc8e0ba53eb137
-DIST firefox-84.0.2-sr.xpi 563743 BLAKE2B fd1e4cae5a682b051b657482e8d3e2bb418cfe632ad1807de3e68cd4bff65cf61b5b58702a23c937b8ebc985fa3be8782e7241090e8561274710c5fb22dd6c66 SHA512 db5d9b2717cc992699acf2a3ce3f1116185f86a17165d12a452a64e860a7f45ca98496ea9ac82787c3552c9b4f812ace99e01ff7da823b09871ce48902b280fe
-DIST firefox-84.0.2-sv-SE.xpi 527551 BLAKE2B 8573d9ea0ed7351d78c0ab3c9c008c83da28552b4f185c5af5fb6d08544048c80bbe9dee9c545b450b36d3de865d9c7ab7f678f2551bc466f5ca11f4bc583975 SHA512 655d32d1a5ee114e3de467a0195aa92d5186981ab229315019385143fe9407d74df014047b93e6f01ce7603ae494d140a8b675a5d8d8c390ffbc12a5ec33418d
-DIST firefox-84.0.2-ta.xpi 521662 BLAKE2B 6256aa75c8e84afbbd0744afdc0445b1bf5a192d6c22ea6e0d045c14c93d64f0d6e11f0a0a69f39b382dcac86edb5e44efb4a81cafa0ea9194ce2f0bedb5e798 SHA512 d2ef742357e5b9cadbe6dc96f5ce1117f27dd87e30e830a45dfb3ea4e479093ccf90906bb139d261a6b97a569abd982b1143b5db2d944d1b18df60b30b1c36d4
-DIST firefox-84.0.2-te.xpi 558096 BLAKE2B 8e387f1098f4d6cadcc4708628e04a315049b6673b75469951d38b1ad97fbc0aaddb9f6f5bafb1aca91ae338d05dd85160e9992ac8648cf4c7f363ebf08cdc6b SHA512 6d49099984b19ac7a647b57ece0659b66df90394c0840bc7f526dec8a34e56ab18e3e91380020b4f8570b36ac021d5121e394535c1fd425b052f7dfae33ff3ff
-DIST firefox-84.0.2-th.xpi 592813 BLAKE2B 451fbcddcda36bf9db8595a38116d70a769b82e6803c6c2a65d18b8a74b9e330fba1d69553fff82d3b6e3f37074c7a53190dac8e0e8277f49a3e0bee6ebd6496 SHA512 b6d908f96172e96f9c29ff76f66c22a358d9026f26d01fd92cae51daf1d62e76bbc0f05d7f8e7cbc7b1cf395469e2ed68eafee02ef5c513625c6b64a3864fc8c
-DIST firefox-84.0.2-tl.xpi 519344 BLAKE2B ebcffc215d6dbc888778bcfa9a2b7299f5b0a480d6f290d9d05e0005057f03fb7ee39988f2648c58d0ab980043c886f586c85c17c70f060a8ae0e5521a3036cc SHA512 180a6c1fa9d48d557a8231e1edc7494ebb8dea352bd22a725df754222f2f67e2cd397012c0a682b6974782a52dd944fbf7dd48a7f2acf02564c89d1b9781c5b6
-DIST firefox-84.0.2-tr.xpi 537929 BLAKE2B 5535a988977e464939d70f37e31fcdb78172f105c2e132bbb2f9be75ecfb4c869ba03f6f590e1f23bc2e56c806e53b84b32a2fb4fb4eccfe0b95e0efb3505dca SHA512 b46631fd88a49c646f5ce800f99f99507948aafa2b7a65a02eaa5d74141d5b095b3293b5209eec64844a07cfe51f2da450133b31c9db579e10f991325d6354e9
-DIST firefox-84.0.2-trs.xpi 500690 BLAKE2B 97d796f035c82a82df123125ec96b61129910c7511de3c5ed261ceddaaf0a2c550ad47adfa3bb9ac55dd2321465a13c15f9f41d7f7326e925399cc46ec96101e SHA512 db1e7c1578e3c7f9d393ab7889681475bf8514176c575815ed3a25054fff661e18a9d7ff4f4ed9a31531ba117ae56abc7363e7d65cc819a59bd47407b7e1edb5
-DIST firefox-84.0.2-uk.xpi 606066 BLAKE2B 35a57ba0caa37989a3ed0b29e37bcdd1bf7c4d7b62d41309d2a6c298db4ba7fe557a87a44ae8e322dd639d6e3732dcd0a206a8652bfab64341a9752e656f3555 SHA512 e7652494014118949ee79d504c03bf90f23d6caeca8c457294d87ac00189525fcc999a91b904d9cec57643599a12b533f25f20f715913f43c9749c433c098be4
-DIST firefox-84.0.2-ur.xpi 558467 BLAKE2B 53bd030b6f70f6616a5ac0bef25be2e90ff033621f3ffcd61d22e222c65963f0df2a68ff3e4dfe52762554e855d3ed9278b1857087ee91fbb576f711c4adfa50 SHA512 04cacf3287e89dd6f4b88300b96218a155746aefe6cf3f95a30aa5a0023f0831c321f16bb14f536a3fd32a636b88cff6e1692886d4a9d7ba67bcd0283a8317a6
-DIST firefox-84.0.2-uz.xpi 478519 BLAKE2B b5667800b0c5cc08a0dadf5a868e019f12a1b622610bc9092a2bfab8becfb6e3f195bdfd9a87bfcad3e054d92112a910b7808e141ea075dd0e937660771218e9 SHA512 63d546fdf69caa525b979da00045dd44b6f7fd745ac3d774f57d862e6a0a28477ac556b570d2866ef9799eb96eef02a01120e8de5c9402e86e9a341ddaced6c3
-DIST firefox-84.0.2-vi.xpi 561442 BLAKE2B 101049828718b0ff75dc38558b28efcbcaa29d9d8de4864e6bb81a3780c7547f50cc39996b4e8bc2a31ed0b2fc2a95777e7c5a35adb2069e6506f5e5ebfd05e5 SHA512 ee47a46d5532ae1a6642f6d252f7a2bd9b4aa61946ce212b9d5ff157402c547bd1a627c0be4b3a66ca17040daba4afe6129a1764c3efc39a0d93767da07a1772
-DIST firefox-84.0.2-xh.xpi 427838 BLAKE2B 3e233c26a53320328ed8557a37ec25a3950c873f495ed3c1d7c8cc5dfc1e685bc650d4a017d18de35a27219bbd475fe3d752549f797677cabc1a9cda78bfa39a SHA512 55156b9ee41f4e4f9e02249a0ed5cb3348f7db6ffc483ded1bef5d6d48cdb7ad1103e1ac1ccc0b56446f627976e384f944f1e4c60012dfabaa512a545ecb1373
-DIST firefox-84.0.2-zh-CN.xpi 562152 BLAKE2B 282156975c144ce18291a1a641f6497ff939b3fbb4fdf101663220134ce65cd32692c423fbcb34f2d60d4ef64439daa4d8ad1b3880d60c041f1ea6e6359e715b SHA512 f090ccb51e3f9f231c175be4b892bf7ccc89f943165fec99b5b7d5d79d3ed7e0f7955bad0e0a5590b7c1028efcf9ab7eb39b0f08e6ba4f9215f9d19788f4694c
-DIST firefox-84.0.2-zh-TW.xpi 562090 BLAKE2B bfd8e042d9e5a5b0c9ce39aba96e3d81a4082eaae0302ce346a4d44ab3417580d54805cbe272efca50c0eb0713c84bd79157c658d1a0f6d1d5670f47ee6cc8df SHA512 a06ac452846c183a90a53a43793f26271b051e0ff6379aeac6e2aa384c18ce7ebb0a2d1a4dcd4b37a7bc5357956766e5b0716951ff58d80ab07ca7b3cb33621d
 DIST firefox-85.0-ach.xpi 461933 BLAKE2B d1f93af47591ee08750afc8bf85ab00eb5ef635bb9d42958db8f0895ed364c911eccc49a17c7e9d49011c1e8c3b8c09538aef85e204f0aa7f20f68f458a61464 SHA512 4b77fa937f9533651575a0deadf2be2973b1b472a21490483e2742455bedeabb6de287e1fb4d6cbfb37717dcba73c18628663839c0f6c45281f954a30b8d5dc8
 DIST firefox-85.0-af.xpi 427614 BLAKE2B 66e9b75a14ad91cbc0658db0b7675851633e98341d821fb0cf38d65c403939ae59ece86abb4b669cf8900122ef3f7b6b165738317f0b9dc077456823740d5771 SHA512 90d1450f0c0dcdd77e99a661f8b9129c6dc385dd016099f44a94434fb92217dfe270cd982d01e095160cb2bd5870e16954b6b28160ae61379d94eaf400ce78a2
 DIST firefox-85.0-an.xpi 509100 BLAKE2B 42387657828f41570e02dce8b0a57487d1ebc06d10a99c7c773c7384ae5ec9664002390fcee642da09d4f4b6b9b78dd4f096e52b19cb173e2fa3f0ef4ca29139 SHA512 cd9ada8fe64c13ebb12c0932500cc88ac49b2e4ff42ca39a8373d9494f41d7beb8a00c127ba03fa820dc05dee086f8f9f1b45f4e68741689fd5af8a09f975507
@@ -292,12 +197,9 @@ DIST firefox-85.0-xh.xpi 426481 BLAKE2B 27ecada17b6c97f5733de5f13afb504fe0c5b29e
 DIST firefox-85.0-zh-CN.xpi 563314 BLAKE2B a42dd3dbf51d3afc89044b65af505073c83436616ae1b7d2cc2c56499863b808a021044b707a625cc38288f6fd783cb09e78d5c62a101e38fc8c28f395803862 SHA512 2d1a31867823982e967339cce69f3d95916eabf25af4417d9b2fbd92bc7db16bd9b988e6e50d1b7990cb205a08761bf8023bce686a74cecf5b4d458f8845892b
 DIST firefox-85.0-zh-TW.xpi 563119 BLAKE2B 25fd2e8d62ff8302df955201ff7823dec6b8f1f2201c38545673e62943f05ccc27bcb68b719830a4b7970c8063cf5d6ef6b693cccfa6057cdf202c6626817e43 SHA512 a982be2de34d8d417dc7043c6066d5ebcfe72381902a0dd9d4bc7240ace75c00f8a1e211f4ac8206b07e38c654247e62f256ac6774bff55f2fd45053c7e2ba73
 DIST firefox-bin_i686-78.7.0.tar.bz2 73072387 BLAKE2B 6989b734629018a336880a94fc705b3cb0eb3e5d11eb35e9143c524223cef4d5222b4b525561d35aebd93777f58e4e1b9a766c065f30efbbf6dd31cc102b822d SHA512 1edcd2236f18688982868d2030c86ef6b82f25c1a4d5bbf4b821118fa86d1cc68d3ad1ec4fd5a74902563b7a0a00d481805498763bc045fdf56ea9c210801d9d
-DIST firefox-bin_i686-84.0.2.tar.bz2 78974119 BLAKE2B 21055c31675c4e4e819e0f430f68470f18d0df117e499db8fcc3b6d5cfc3c2d8ff1bb7e374d74c12a6399276c8c064aadff072434e093eafae14fc97c44e7a3e SHA512 08907992bcd2edad49a2a30b04b479efe799a4d7a8c1c0171e8be8f99f5b0999bd2ee4b45321867e2b40b4bec3df9cbda8a4cceb8dc1c14bdd8b232e0df408c7
 DIST firefox-bin_i686-85.0.tar.bz2 76717220 BLAKE2B 613f3c6b5e8fc6d63ef7f6cd082a3d2fbf8ebb415bd6a562641c12af1511b48931d617ed5aa9f8a79a1aa46624ff036ba3a7693516f009db20567be9b52487f5 SHA512 1dc6ca3b3753f5125878f546956e5b40718cdc7372830492aeccc2a5a5a589815b123738928238cf3223942e559934d24cb0ad80e6c84a9f078aebe57abfcb13
 DIST firefox-bin_x86_64-78.7.0.tar.bz2 71107110 BLAKE2B 6f2582e1b516d2ac6c240a451631b0c182b6502b69b54894d1fb2ae5a3a1f131906c3f1b6cf2acea3e0d3e6946494b9efdfff5d9f7d24a4cb2a19cd2d25326e6 SHA512 e7344ece56411efb6dae77ecd04eab91b7717dec75f01f200ec413a7c9d7a3ebf0adf827b77f437f1c0a7a0191cbc122ac2be4432c840d59566b81dc3b69ef57
-DIST firefox-bin_x86_64-84.0.2.tar.bz2 76303870 BLAKE2B 53419a4a7ddafb0fd88120da72ba1f316af629fd3b2dfa00b220459b4c1de821a02ecaa898927ee713061c6ec0073414a36e6ed16c51bc5f69de9c28ade52fcb SHA512 bcd3b11f5f96a9e9809a72e164f35c32664a9b624dd1c87017e0331693737b003d24ae887eb04963865ffbf2873a9a0f396840e6d825401be95ee0741690cddb
 DIST firefox-bin_x86_64-85.0.tar.bz2 73677428 BLAKE2B 737600426eae8cd1ca0f1a46950c075099fbd6f399839a259f36227c7a863fa890701a2ca42a5d2c0450f1ee30820fccd3d2ca33a483009fd193fb5c9144e9be SHA512 56b5ddf6f0e1918c1f1d30e1c640f7f4c4ff92d2901e47074e8c88898599d2f12e13b9a4889c7ad044556b0e9da971014aedff423eb9b0177b914f1f67241e26
 EBUILD firefox-bin-78.7.0.ebuild 11363 BLAKE2B 52d08fee2a6dafb1ca52a887bbec112f633afee3eafe7d96974a07e821ef7feb9ce3891528a0ad2ffaadb6e293c609ba751ed5e3fddabc16dc95a406b231a93c SHA512 914af427e1effbca5432966971c0ba89ca94004554ba93d4562da788a85b98073c4ccc91754036a69e4e05ad72049e93e4e08f63644555b1bcb703eb8454d30c
-EBUILD firefox-bin-84.0.2.ebuild 11357 BLAKE2B 24f2c82268dbed148716d4ee50a50c71533f7bd7914bd4fb333616cbe07b3916a894a57da93438a064882795660f805abdf4453da6d66c374f57080e624558cf SHA512 7325bfe17fb5346722c4cf5f2dc03c0d6b36f988de21b6d375b1329e3810a9ff80e877ceac2ad31281923abb5269088c504b90f9fa591792815f1dfa1021bc22
 EBUILD firefox-bin-85.0.ebuild 11357 BLAKE2B 24f2c82268dbed148716d4ee50a50c71533f7bd7914bd4fb333616cbe07b3916a894a57da93438a064882795660f805abdf4453da6d66c374f57080e624558cf SHA512 7325bfe17fb5346722c4cf5f2dc03c0d6b36f988de21b6d375b1329e3810a9ff80e877ceac2ad31281923abb5269088c504b90f9fa591792815f1dfa1021bc22
 MISC metadata.xml 425 BLAKE2B b26681e09f7a128942a50f9edf7ea7db4060a91bf5384200793ee3020b48907d034617dba59b6f71a54414270b1f94909eb2d2e659cf845ce2ac7ee095405fed SHA512 abc41a669eb3f658829ad46631cdb560b4bb26297f6398981a66e19b54bc2403b3b2913c904421b1afaa92884d55a910a1fbe3f029911b2073557d1311236ff0
diff --git a/www-client/firefox-bin/firefox-bin-84.0.2.ebuild b/www-client/firefox-bin/firefox-bin-84.0.2.ebuild
deleted file mode 100644
index 811038b1e175..000000000000
--- a/www-client/firefox-bin/firefox-bin-84.0.2.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit desktop pax-utils xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0/$(ver_cut 1)"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland"
-
-RESTRICT="strip"
-
-BDEPEND="app-arch/unzip
-	alsa? (
-		!pulseaudio? (
-			dev-util/patchelf
-		)
-	)"
-
-CDEPEND="alsa? (
-		!pulseaudio? (
-			media-sound/apulse
-		)
-	)"
-
-DEPEND="${CDEPEND}"
-
-RDEPEND="${CDEPEND}
-	dev-libs/atk
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.26:2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	sys-apps/dbus
-	virtual/freedesktop-icon-theme
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.11:3[wayland?]
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.22.0
-	ffmpeg? ( media-video/ffmpeg )
-	pulseaudio? ( media-sound/pulseaudio )
-	selinux? ( sec-policy/selinux-mozilla )
-"
-
-QA_PREBUILT="opt/${MOZ_PN}/*"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-MOZ_LANGS=(
-	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
-	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
-	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
-	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
-	si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
-	xh zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	mkdir "${S}" || die
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			MY_SRC_FILE=${_src_file}
-		fi
-	done
-}
-
-src_install() {
-	# Set MOZILLA_FIVE_HOME
-	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
-	dodir /opt
-	pushd "${ED}"/opt &>/dev/null || die
-	unpack "${MY_SRC_FILE}"
-	popd &>/dev/null || die
-
-	pax-mark m \
-		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
-		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
-		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
-
-	# Patch alsa support
-	local apulselib=
-	if use alsa && ! use pulseaudio ; then
-		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
-		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install icons
-	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
-	local icon_symbolic_file="${FILESDIR}/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menus
-	local wrapper_wayland="${PN}-wayland.sh"
-	local wrapper_x11="${PN}-x11.sh"
-	local desktop_file="${FILESDIR}/${PN}-r2.desktop"
-	local display_protocols="auto X11"
-	local icon="${PN}"
-	local name="Mozilla ${MOZ_PN^} (bin)"
-	local use_wayland="false"
-
-	if use wayland ; then
-		display_protocols+=" Wayland"
-		use_wayland="true"
-	fi
-
-	local app_name desktop_filename display_protocol exec_command
-	for display_protocol in ${display_protocols} ; do
-		app_name="${name} on ${display_protocol}"
-		desktop_filename="${PN}-${display_protocol,,}.desktop"
-
-		case ${display_protocol} in
-			Wayland)
-				exec_command="${PN}-wayland --name ${PN}-wayland"
-				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
-				;;
-			X11)
-				if ! use wayland ; then
-					# Exit loop here because there's no choice so
-					# we don't need wrapper/.desktop file for X11.
-					continue
-				fi
-
-				exec_command="${PN}-x11 --name ${PN}-x11"
-				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
-				;;
-			*)
-				app_name="${name}"
-				desktop_filename="${PN}.desktop"
-				exec_command="${PN}"
-				;;
-		esac
-
-		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-		sed -i \
-			-e "s:@NAME@:${app_name}:" \
-			-e "s:@EXEC@:${exec_command}:" \
-			-e "s:@ICON@:${icon}:" \
-			"${WORKDIR}/${PN}.desktop-template" \
-			|| die
-
-		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-		rm "${WORKDIR}/${PN}.desktop-template" || die
-	done
-
-	# Install generic wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}.sh" ${PN}
-
-	# Update wrapper
-	local wrapper
-	for wrapper in \
-		"${ED}/usr/bin/${PN}" \
-		"${ED}/usr/bin/${PN}-x11" \
-		"${ED}/usr/bin/${PN}-wayland" \
-	; do
-		[[ ! -f "${wrapper}" ]] && continue
-
-		sed -i \
-			-e "s:@PREFIX@:${EPREFIX}/usr:" \
-			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-			-e "s:@APULSELIB_DIR@:${apulselib}:" \
-			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-			"${wrapper}" \
-			|| die
-	done
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
-		|| ! has_version 'net-misc/curl'; then
-		einfo
-		einfo "For using the crashreporter, you need gnome-base/gconf,"
-		einfo "gnome-base/orbit and net-misc/curl emerged."
-		einfo
-	fi
-
-	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
-
-	local HAS_AUDIO=0
-	if use alsa || use pulseaudio; then
-		HAS_AUDIO=1
-	fi
-
-	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
-		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
-	fi
-
-	local show_doh_information show_normandy_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 70 ; then
-				# Tell user only once about our DoH default
-				show_doh_information=yes
-			fi
-
-			if ver_test "${replacing_version}" -lt 74.0-r2 ; then
-				# Tell user only once about our Normandy default
-				show_normandy_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index b4a4c98db0d1..f743383921ce 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -104,104 +104,8 @@ DIST firefox-78.7.0esr-zh-CN.xpi 564772 BLAKE2B 94633d16a271194dc7e0560419dfe69a
 DIST firefox-78.7.0esr-zh-TW.xpi 564734 BLAKE2B 4484dda1ec861e9f38a465b2fb43c5ef96f2f688350c86a84825dbf6e3656a03391584bcd0f7cff532b77ac5cf6605e59b85b073af801038fe23c0f9e3ff6aa3 SHA512 852481db2a47a48c0c29153aef337e91d70aa0c25854026c76fbb47775d87e96b657555776c3f09f75925044e6ce90f99a419d43c6b4f9e9665b59f0ef49a6e2
 DIST firefox-78.7.0esr.source.tar.xz 332849732 BLAKE2B 66e224021cbd15b6b625da3c0a98b05026f4f284afbef5299368a218c16da24cd05431ab82c52859b835baf63298ec832681fbc58b3bfe833e68dea1737c6dcb SHA512 afa37d2f6bbe04715d84a8964f75139042364501c358da98771115d7fe7d23788e95b6ff29d77c064a9cfcd208c1424924017ef2a72cbb79dbb45d6f365f030c
 DIST firefox-78esr-patches-07.tar.xz 66156 BLAKE2B 8f69883432dcbd484b1fb15e3fde1630b1424e502ba78d9ec3cbe70cb2676a6876853d3477c8bfe35e92bca91b200e2d14543de1778d895676a52d2608109af2 SHA512 b4a01d3499002bd33a7fb45a1a80e9e73ba27a0986b6bfa43b3482dd8d82a686a14ae0c5e013402c8c8f359a642632a40bf4c362a0e83a1f53b453914f42e3a7
-DIST firefox-84-patches-02.tar.xz 89512 BLAKE2B e1fbdfd2f2a0a128f4107d2db67e4abb1781c35704c1364c5f5527f8100c9063648b5cfc69086923b3c204fb883570ed901268cbb3fda2880ce923eaf7b2dbaa SHA512 ba96ab662c6b19be7ab99870363816b6a10da29d4743a2196e39c1b5ae2f20de28d652249484a3dc2ea259e0e9393b034300b84fd42f28755610550ba29db7f2
-DIST firefox-84.0.2-ach.xpi 461779 BLAKE2B 09ca96b1583846c454cfc3378fda6a60b5fac543fcfc69b0579535af30020272435062f18b56f5437f05b9c3b564717e3c2bf5515d66c1e89e4ca6e8598c4656 SHA512 be1302e69f7f0ded255cb348f74d395a80567b449ba731fbea2a0332df58625dd30445c01b97a2a753719af3d123d6bcbe05fa2390aba94a5c88b6644abccc33
-DIST firefox-84.0.2-af.xpi 429055 BLAKE2B 418471dc76eb251115aee2dbc32229420775aa7318d218a39790a5d715fef72f5e49d2aafc61f38ef00539c969c2549f6ff038fad50829e7b542301a4bf42a45 SHA512 52de79669bcc30ab2f3c42b4c4375b27df36007e5742a67b2bf79e24347272ed4cfba80ce6024682b7c2bdc6c7c12ce20a587d0f5d8669eecdc584ee0550f6fe
-DIST firefox-84.0.2-an.xpi 509109 BLAKE2B fbb28dca915a1309c78d4249891ab13c59c25ae64008e4f21e6aa93818f7a72d5de12c16bcb8145864a15772cca8a08ad5aa5fb8327cd89206028d282ee21b22 SHA512 e805aa7dcefe4170278344471e90450e157819596c6ef9beade028c2b03d021a6cadb2d5986ce447167d8cc8dea1292e7e205314bc8bf8e1f363e91d0cd5dd82
-DIST firefox-84.0.2-ar.xpi 560417 BLAKE2B dbd28e1b29303209e4dbed05c5dd688a75e7e2a6416ddc111566734a44583343b7f1183e74341956ef5eb7892fb6a6bfb680180562825ff749a8842de772061f SHA512 b08f51626d11525b7d574d82d34e5fce19b507252f26b97537522adfe11e22f6f982680e488fc8e76c2aa33c820da4d51895eb5b019f5a4f846796209f3ddbdf
-DIST firefox-84.0.2-ast.xpi 457477 BLAKE2B e29bc796f15a1ab9a067b88f6d6ea7134fb3a428b828fcee2bfa866876033a4629eb63f310794cbfab21799af2a781471eb833290247f91443d22f87fd219d90 SHA512 ead73901b996ee133c5ba20fdc40bd8437be20a35f3c4d52d5e9a65a6b29f31bf906ca2896beb072c331d2c94c7af2372af90059dfa80a51e94a7dff213dcf62
-DIST firefox-84.0.2-az.xpi 498631 BLAKE2B 06a552f7457895e4ed6ea197e32efde87b2a26586c9484dbb10b12a58f58c48ac1ea57a3f428e6ce0f90ce87de0dc2c625c78c57d98eaeefa37dc397e07f8d39 SHA512 6135b9fc9a0b83330cc0504559f014978542749138c7b1ac8e17a807e64ccf522a1390248944c1225510520f489293254d276d60e939df68ea4d3c31ecef0976
-DIST firefox-84.0.2-be.xpi 606507 BLAKE2B ce33dc06a3f3388cf2e6990cf4f3d60fbb61dcaceb81fc9bfc579a39459ee1336cfb512de1ce772ddf0afc675601105b5808f5eb80da3f314ed48341f781531a SHA512 72b2b738c471fcdd3064e003545505384bc6c2222beab1c4fd67839b50486309adf57aaf329f5acf7c5bfd5a3d21ff8b2c8b95d58024580875227453b0ee7494
-DIST firefox-84.0.2-bg.xpi 556435 BLAKE2B 96cd7091d9996f8ddbd0f786614e4dff232690833a9a91d6353882b6e3bfe9dae5f04d5416b4067168875e15dd70773b7d45be2193c447f913408f51ffbf409f SHA512 d5fb1c1d2006a936e973e58d2132621cf3c795541f90135c35a06b540396d1fdf36d2448a46bc689fb032cad0edc9f2472abf993246ed8bd4f20409926a0704b
-DIST firefox-84.0.2-bn.xpi 573373 BLAKE2B 4cc42d9899fe0fa0c249a5811e64f11a44641d587b3ff79e384718f512f0156c7f65a417eb3805916db2f1cf89159a54cd7e5c2be376056abe014d8e085bed7f SHA512 ca1801a8ec1f8f6b15d899df17aca00c09b03b077d4c3878e4f97d3a2f9a2d817c3e4b72243d26582790691dbca463062549c6b4e465c6ebcbc71efca6411277
-DIST firefox-84.0.2-br.xpi 514058 BLAKE2B 215e032f105bb81fb67801e7936bf295d0f174982dfb0b637d0fe071c72c0e2f726d1d0f3e1f55302e1411873963760cc2193e8f5bfeaaa78b87185a703c0dd0 SHA512 7065e2af1b9baf5c343811230aef6b17040631da2d8334a6ee13d8020a1ced542ebf0cedc08d66bcbc8fdedaa8af0b3aafa92d2b3dfb98a64aced524f74308d9
-DIST firefox-84.0.2-bs.xpi 465252 BLAKE2B 5d8d9fb3d26328d7e2719f07270d06f74e8f285268eee40454c97104a02674fcb5bc601aec1d01c9f20cd782260ee221f394b5ccd5b321327181f3084493a292 SHA512 f3abf9f8e1d3a0266f4e2be863643f76f736204452a86cbc847c45a59004213dfe3a3503719dc3a5098dc8496e4ce97076e4b12dbc76168c96f4c6881687f39c
-DIST firefox-84.0.2-ca-valencia.xpi 518017 BLAKE2B f990bf8dcdd5d0eca17b428a7ecaab93e59354292a611c57a51c2bdf44697a55699d30bd16b0cad5a36d988c7d272f2e37ac223643320333b02ac3a74a95fc14 SHA512 3e432c20ca3b1a7bb2b4846ca220877110a7928345b62d3d37a32d958507f006ecb6f44e5172d162b63361269fa9442421a7c0e31bcf79378f08601aa7e7562f
-DIST firefox-84.0.2-ca.xpi 516045 BLAKE2B 8beb1d13549b2d278e32b148738bc29a94913992d24b08718bf98966614d80855b7a410d0be99ac44d905aa42bf01a55f9309481a27b40de14046167831a3176 SHA512 37f3a98d3092825e4aece5af1621b2fb1f145cf2137f213790bcb1b52605470f5b6b38f8b6aadd654060f4887e37711fc41462681a99f0cf612aa199b02d9a72
-DIST firefox-84.0.2-cak.xpi 549485 BLAKE2B 76c420cf01a0e4c9d38d5396ecec08e5b4cf9dfb17dea2d7a5835b51556ffaff88b0bb34303ce0870f54f3ef16664a845065d753d7a92b05bdbe5e0c9c0c4075 SHA512 98ad2589f34c020fdd6100409069f67313acfb3ac8079ec01f1322d8586cf5229a71077b9343e6878547e421b74deeb0c3c69e297ad1ffd9a62c78ad4fce9a1b
-DIST firefox-84.0.2-cs.xpi 540236 BLAKE2B 6bc88d58df741509806b09022f453d67e221e05335224576e66e7da0cff00e0e28cc140ea699d73609abffa2ebcb43e45f6dd03a4675c57f2ea3d2b4278f1af0 SHA512 233812418d71e2a73e4590d69d18b8eee9a5910790222c0e31248872ca1cfff40b3eecdb593785b3d7ddf028a851267be027387ec15405c76cc176500e9c909d
-DIST firefox-84.0.2-cy.xpi 528801 BLAKE2B 52fb19de2f76ca32d7564d34250c0fc749293a6cca388a37d9caf4d437a5735f76d755a4acf5372521a713820c8f69335eafe1bb840cf63fa30c5e9599af4146 SHA512 294d03569417db9120e912a1bd966f97e7220cf564d72cb30ec5ed5c20b1b4bc3aa08ab6e97a8fa43ee9546d5cb0c22bade3dc443fb39382e4df54b29923c438
-DIST firefox-84.0.2-da.xpi 520971 BLAKE2B 0e71c5352d13c795fd5c6e6e21079f5a2697aadb533f0c54246fe5e0577cd561b697116373bc3ff2a523cadfddc39ca43fad7b44c7e5039c3675c831ad734960 SHA512 3acb0e370d2706edde3929e9e770348fd9f804de6bbd81113f2d1d538a819d8d8665527506e8d12d7b095a10742c3d1477b8204d47a406282e71dc2540635eb8
-DIST firefox-84.0.2-de.xpi 540875 BLAKE2B c11238cc731beb34e38f460aef4361e78d09c22c6a691402105c5a6358d9f16f648484cce70fc47859cc25ee05ca9e8cb4a1f4a7b714ef192d571fb960e84997 SHA512 b3218266714d9a1eb34b3521eb5695877bb1ba661a915b8db6ff06ca1e2731b884ad81e1d748dfa6460e51af28c17840ebd26cabd81eb41fd2d31ca68c84b49f
-DIST firefox-84.0.2-dsb.xpi 552207 BLAKE2B 0c8789a6992f66c3ad66fb90dc2aeb5507c49cb85594bc9771a715ec9ea825666fb9cb7d63341a00de621314b5e025ddf358b805352e4dbb851e526dab8ee073 SHA512 4dfd55995ace0a0c1056342449635956d61202fb1075c239174e2b7d1cd56cae661b1cd6cfbbe92c24aa234064b3b4631c0ce187434c006689afb86374d3139d
-DIST firefox-84.0.2-el.xpi 623767 BLAKE2B a4a4112fd94d91b70a8ed388123b78d8d23756e60ebd5d774f5c0ec4c619b656bf502f8a6e654707963ebae0fb57259681fedb54337ce9c7fc06214ae9eaf9b1 SHA512 ca0b7dd470bdfcdff064b15b2a0ea650d8032ad516ee7c798245b1ca25920aeff410c4dd26e38f5fdf747030201a55ffb5197a11a09c7022e33d94502dd95fed
-DIST firefox-84.0.2-en-CA.xpi 495292 BLAKE2B bd8ef98ff4fc76941270bf76794d26dabd6699f4ed3a5c09d1dcce74e8e5d944f45acbd258a4e8de4a990562f051bd572c7183c3a6452a61744f8e045dea927e SHA512 c4e057233e91bae15b4e3838114a74309909c3f154764882245717dccbde17b74b5ebd33833e169b12d4aa67f5eff2cba951598be16ecf241b570a4524b5dc77
-DIST firefox-84.0.2-en-GB.xpi 498699 BLAKE2B 3e1a910460b1a07d75e7557a3d2a8284ba425873f5f10a4cd6e24fc98ee10af9df637f043f1dc781416900bf81b666e97f556598acdf4731359faccf08955ecc SHA512 4ffa546598861d50c328ab332f0f119a32ed637c8a354b11a4db7e3897735ec824fa4be1692683b8f4bbb81a35283f19b86276079d50904a95529c879c0bf838
-DIST firefox-84.0.2-eo.xpi 523253 BLAKE2B 075f8e7b77d60362b609171c1537cf5c43d83dde9241ed3778cc99bdccce91131eba3cc43263fcbc9f30deb1a7d2f380aa403f2f09503758660f036fa04cd22a SHA512 7e100f56d9b630c065365bb4300c039d570a071066f1a0c582da0f7ccff61fe5b0fcab65c82eb2ed1c6ddf36785024be607ca45d800659a8c5a62937740c9732
-DIST firefox-84.0.2-es-AR.xpi 533690 BLAKE2B 05939866663e2fea8e1bf2b083ee59dee2d454ef354fc6c0f0205bf01988b4b0d94a3a2edc24c29c27f342782941d2a19ebd0421c94d8363380a1126a12a4ab6 SHA512 fbbf9583e7c758daeaf6dcd46e6fe3ea85063981c3454094eb27f6b8ab7c8939d867ff95b589e53583ef450153e756db16a3169300d5001a0a32419b156bfb7b
-DIST firefox-84.0.2-es-CL.xpi 533180 BLAKE2B 19ab6fc24a6ebd22fce83f5edc3d3e6a5fa4981dc7cce2fab1a6d5cb1a4415c9e51b268192b82763f828b8e801cd86a32e44fcf1dfa3980cc7c7fe1ddf9dab4b SHA512 294fd39dcd9f28b1f451ecfd8aa011af9cb7103079ca24f45e226fd7b20bbe44f82d0a0bac47cc4297348f4b8133be7b110e7922bd52c4afe623764b768d7dd5
-DIST firefox-84.0.2-es-ES.xpi 523075 BLAKE2B 96cb9dd89363913c4433d2949e01503812d0d8406c6cb401e3e9ad9fc9591512115e73e1f3bd99af678994ea5766b9c9d56513db80e5c0b5d3ca46707992c9ae SHA512 3fc613afc4641b6f80ac7e2b0d1c40afcdb5ed3519fe6a55b90d1cc35ec9e8e3936803309b0c377d784f6f93a932309a492fe5463ba75b8f62d2942a3c66f6d3
-DIST firefox-84.0.2-es-MX.xpi 531350 BLAKE2B 733676fdff7b146ac83cce7a8af2e5dda2e88c7e44a39acd534eee66edf753f493eaef6d9cf6b870e296560c87f9edfdc3af91164b4b68810cf1ec8a770e7661 SHA512 b88543f7a1c99358cd4311da7f379d01bb1b9e7b11a937715d6698e74c1ab1e4ab90208945c9584dfb0788d2146528ffb91cfc9b966f26bcf05e7de0cbc6cf50
-DIST firefox-84.0.2-et.xpi 486949 BLAKE2B 9b54cd24bd8623efef4c0c81ba1a79372d7ade44393f7402c4fcc8eee544f545f02fc2038ec95ce7ca7f1c8ec617361f9e40797619b498fb221dbcd022826b39 SHA512 6cbb204a36a6640b2c72120e265e148b7e902f0bd10fedb4d2f21513eea1a1745bdc706c7bfe03c8c90f929d38bdcaabcc64d72f94be4c9a5c6be77c6893cd5d
-DIST firefox-84.0.2-eu.xpi 515144 BLAKE2B 62428aab86fcf465808391da7db601ebcfe6c93700a6e7ae755e3ebb60a8b127927e0128449a30fd6d31f20ea8260f55c8811184d56c35ad23e94855fd9242bb SHA512 85acc823da4f9c322f1f488f930920c3d1107f906fab151472d7152dd1fde41cfe79c3abc2fc51b49419a37c6d8a75334745ff9a92bec6846b05efa5e90cc085
-DIST firefox-84.0.2-fa.xpi 539667 BLAKE2B f31f9f93dae37a45b628913783b2c5c914d120db81f4f3dd930e192137c1dfd3fe067410b8b1a53021eb2b73528130a1ef9d395c946133a85a1014f7db23a510 SHA512 b294ddf12aa2bdb85ef64215b5ec05e65c2e871dcbb56890caa051957dc35e4dcf3b01e96e43abd79cd30d22eb433e9e2c482c441344962fe1ab90c560b9c0ca
-DIST firefox-84.0.2-ff.xpi 483210 BLAKE2B 24eab999855fc8c9d5d94c17d606e26d8ac4c1579b4f2d07a4a7d851af51231943ed3c7ad6ce20b3bd0b2e08a7c0d81ed578676c4ed0244bc82ee84348622cd7 SHA512 acc94612b587027648a351628fcb3ad4ff222f1139899ca454ac6bd59c92b2f41323785d8c3afed0ebd9ed7bf514cf08a41bb41bc0dd17d6d34f6d9da04b01c1
-DIST firefox-84.0.2-fi.xpi 520035 BLAKE2B b0743f033f1a66c2b73dac1ebf3014203bf7097f5156372f43dd69ead1e7c51b5c44405cad8e848336d5ed1cda7416c95a819de56623858b983a05c69a13ad8c SHA512 9c23265605508f983a77bd10fcb1191c17fb401f78516e948dcb60b5ffd1775e9a85126802c81358edfa71cc1ddba3929d15a89ab934a1b85e598175ab78893b
-DIST firefox-84.0.2-fr.xpi 544373 BLAKE2B a00fff2f41a2b2c52a435ae612a8dd472012d66522a421111ac24770e72acfce98b779f57baf1044e6dd558363919adfd9f58dc81ce33ea6126272aa434aedc8 SHA512 b699787492e7f8bfa77a6813b01721018fddbe2c16fc8b1c02ecd923fab40a6dd7875e56bf3fbff56865f7e26b52e54e50b27e1a6c7545608018ffc793fbc7ed
-DIST firefox-84.0.2-fy-NL.xpi 530312 BLAKE2B da851cd97e1404108d9e97ba82d53562a88ee93366644ab8fda12b3fb057b5f0b13a5d77dd00a5152699a2cd3d4b87759f1a092f169b0de2b37966765f244238 SHA512 203a4de835df4e840c1807317f770855a3afc82a79547c0d10274dbe0b659ced3d9aa730e0e4540b40fcedb372c6a7e04017f50e43e7bd84c975b2d1405010bb
-DIST firefox-84.0.2-ga-IE.xpi 468070 BLAKE2B 632a37bd9fc2ad26911d0b64117c4a0a8c6b13c83b818785269f1ba105d6ea167a2888615c5fce325dd092d870c588919259fcd5c85e7bf2e3aa2c148ff8852d SHA512 57810fa116f979405669481414a2f47cf7da7f287b66abb57787835e568bfca8aab02eec2e4474fb6b6613660fd2811aee9a1562fda414bd8dab3796643d0392
-DIST firefox-84.0.2-gd.xpi 493499 BLAKE2B de77ec5a37f55630d5d4a37c01ad14f7df9560cb0c753f99ac79797884be12819576b596ea44e826edbdf2ad8485f7295134c947e50d40ffe71dfe142c3bb823 SHA512 38d72a253b4bea039777fd519535286e4a43ab4972d3d611a36fe2b84e9deff7a2fcb82a8c77732e92f762ae0189ed59d3c8135e370b017a77bcf875dbdeb37c
-DIST firefox-84.0.2-gl.xpi 525656 BLAKE2B d9c751b6e1f44ce5c1e3207df1dea23eda200ba383375a8e3c670554f0ccb771c0016f6c5c4e0b5e0e509dee4516b78d6e48a8d9f64aaa3fea6c31d99f4cdb06 SHA512 833b975951ba1630b3b4da4c3a02026a0a7761cdab82c816cd3e0048afa3e4032dfd14c3d08ef5a1e01cf4434aaed342cb8ae84de2b6a55fe33bc782b2eddaa4
-DIST firefox-84.0.2-gn.xpi 544449 BLAKE2B 824e9497c0d87536380dd1c2f73f48f72b881aca1a3637433a98d2bbd9d12d059cdc7cdd35e66fd2c2209227da4845b121d987ef336a6b6d5ea2eb8f2d328bca SHA512 2efd64d0b34c66e55f60cf4b98f9c0c14dfdbe687e442abff59234988b0abe975b825042dcb2b7bd3381b1480134ed68b1924021b1a79931feb9335977092207
-DIST firefox-84.0.2-gu-IN.xpi 542131 BLAKE2B e56d1c7486e6324c80bc09229d7c1533f76cc28b5f187a3594366dd8539337360d5e3d2d46472ebaff8318aee2c0960bcd55ff7bb44786c5d9ae9acfb9ffeafe SHA512 4b89d9bf3095eaf1a6de539b6e7c523720f3810c2ae6d3e6418055d4ab2dbb11af1d4f02d3c2523967c2a08322f35e3defab1e10fd5c97e8f1583a2a807b2ec0
-DIST firefox-84.0.2-he.xpi 545453 BLAKE2B 88cf79329ea2d9e9414ea3acc6dccafe7fe5fa72993e3972bf220e710d51fffaf2b69448381b8047e28a205b07abbcf0c122a648561b59a4090f6bba62f5fa12 SHA512 d4ee28bf0f3f0926c157bde484133c704490c4cf9daa649914cb3c1b5190f3668ca939ca11e1967c02a4e336deced96e68dd2e01c41c07df7d0829f97b277c1e
-DIST firefox-84.0.2-hi-IN.xpi 568115 BLAKE2B 3b9628f231fd9ce25e1aa343779082b65f81904738386bc8361929fa96426b9462c27169427343b5f6b9777d429ddb91ad94f03e211e37a69d3a4fb1c5d1fe31 SHA512 187ba18ae7c5e0abae95ce129eb3e5642bc3f683e330b629d4182d0616b65d4637a6d4a179ad7a81caf5ba72413348d38fa15abb6a8aaa9ee6199563d3735f3f
-DIST firefox-84.0.2-hr.xpi 521273 BLAKE2B 52ef352eb8f4188299084e470c58fce7361709c0ffbaa5891c85e3e52173cc3bac7db731270ebef714da621b0b57ccc64b1f52f34a512a93523e1c6d04f5ad1d SHA512 58f837ae01e85f2176b01ec909f7fc9250b6fc01b7f49c936653f44f4641e2feb5548836f09b1f95b001ed9e834938e9c8ba7ae2e32e372d10e8c9efbf89383e
-DIST firefox-84.0.2-hsb.xpi 548613 BLAKE2B 432678e15c084bcc3eed408601d4a8977c36f8095fbebaec23290403e2f06d87fb18ab6dc9e5c79f5bd96050016292ca63ee236466f01acd37204c0546b1af8c SHA512 9b566c07fa9cbc93961b70ec320b2ddc74a407f6c31b2da9acd41716055be1f73c055ee83d5d3e2051b898dca9804329ecba3fe6eb0af7b5508573b4aa142a11
-DIST firefox-84.0.2-hu.xpi 552382 BLAKE2B 0f3fa98dd3ca0b5c48f308db88d39d8487843a01195b4ee6c93291894ded5b5345b4dbdbd594c028716bf050317c7ba2c62882acc739e07b322224bfdb2bbcad SHA512 920aef72bc2e3a0476fe2532424fe5d9612822371119da9556b1cb885b1a1e7e04f66e3efbaf6ad89916e16c95d202a801e293af04c86f3e4a5b9e0a279998aa
-DIST firefox-84.0.2-hy-AM.xpi 588506 BLAKE2B 42df3184fd5c15c8e2c1beb28817679ff962d596d4260a239f74da498ecdec2622d762d62dc65a40e13ca82b1e199bb1a3e1ba1378c9c98c37ca5ca40c4979d5 SHA512 d995fe892e733a0ba065f3964d8a46effd44b326e76d3640dc9b9208154878bc3b3231641570af5d2bceff84f13e5d299a494b9740a13f0d9674d4cb8d4cba0b
-DIST firefox-84.0.2-ia.xpi 519834 BLAKE2B ec2edbb4e0c2bafcf8d0839b3179a44236efa68559521691250ae608d67f711416489cde558d867fba7ddac68019e87696e9beeacf8692bb135a4e3a9723e511 SHA512 fd54800ea61eefe9ed2905443be9b204056a9bb38ab181596cdb817ef21e5ae9d67b8ebd18490d885c8e1ca2f803454a41ea9f9d42047b234c4fd9e88e63f735
-DIST firefox-84.0.2-id.xpi 508530 BLAKE2B 8f63bc80ab42b1496fd6fc645c21fe38e6cefb0306f7194e7fbee3bc4c1f61732ca15112a737d6c0c2ac2edd172c206ef7c222f236ab267587e746530912d75a SHA512 2f7aa3ba86d41f36f2963dd4fb2c6bf9155c77c4a43f558ce7d4d490cfc5c34ca15257b5f00f21f454ce89e8b18964610aaf6c2bf7bd00900d5cfe3740e39bb3
-DIST firefox-84.0.2-is.xpi 478792 BLAKE2B baa7e91d12fb31e698e6238467f0651245522c66039b2b76d9f83ccd278507b92cd33d1741b3d28f877761b6577c75e42377f72bfefbe31ee2584c3851da9c61 SHA512 cc1433e30de1de5ea35510dfed631602ba25dce604d2ccbc339ed3f3618522a3841977701b4d5655b1a19b058664f8f5d629b8a70ae34b64923b43d9e4357e52
-DIST firefox-84.0.2-it.xpi 448149 BLAKE2B 919d5b523a1511019507359a210fa805f744c94b2b70eca277005a9b19ec193ddc4e1861f5f0821c9927f03d9e36b2930e8b0a6983e59fc6beccc6b556eeb46c SHA512 76663a6d7cd83d362c42b719fb06cfbd6c6835cd88aff1578f694757ecd1ad8a2a9222ec401197a31ad00db434154fea0e9d8126dbc976e0485d90d3a5469b44
-DIST firefox-84.0.2-ja.xpi 578208 BLAKE2B 9ae19af018139d7dbaf658ce6299b45d1861587c67aa0f5d56b1330a4a61d216af1cffabc0aa53cd9b53f383f1723a4f84601e0e69e588ae97121c348a544778 SHA512 8336df382e58df174eebfa07575c8b4cf0adee74c20adc55d1e434dbc4981ced9ecb4977b28d8e8a65e441b746cbbd535281e0895daf98f174a41f1e45d3debe
-DIST firefox-84.0.2-ka.xpi 579048 BLAKE2B b12582ed5f4dae5dc267cd647d0be185f1bee8ada896a16fbeeeaadf1570586013584fea9efd6ef5d7aaead51f037a9bf35da61ed1f6c01c5b1d4ba49a4beb6a SHA512 785c1405e7c004395af7aa092c2c81d15199a933ba823ecc42441d027c9c74ffeb1bee19a848af00f9a38624d1a08baa5a6d7a8221d6b0d620e8bcfba45a9437
-DIST firefox-84.0.2-kab.xpi 538420 BLAKE2B beaf6433b84df150f6bd11264ce256df82fed43b6558f15bc38cf8f34c4d1c080183e49a90b7dd717778452c723a64ac0e27cb6c12f92b95a7b37e952e5cc18f SHA512 ec9724f681d0cca783ef50f7ffef3e1a34e2fd3694931bc09a6adca7c1904045c5afd4966a88f32dab41fcead09e1e91fae7c41bb6bd6dc1a22dcca8023e6bd7
-DIST firefox-84.0.2-kk.xpi 591074 BLAKE2B 07f4f45600822ce84bd07b77a2cb2a53f72c9726d8b707b0f04b753f7f895caa5fb506af248de3e5bba6319f078da0a50e5b3b51601d162129f08cc7ef274e1c SHA512 586030e044290fc843bfd236917b35ab838ae9dac82a44e8ac9db625736561baefb68c03547e0fe23e8a4738def7175a2b6f2253a021cdbcfa37b0ce934ee4a4
-DIST firefox-84.0.2-km.xpi 527421 BLAKE2B 94daf5b55d3e1c92c15de923980e67657a4277b6cfb2f2e05454c0ee351409a5c240294f05b418821b277da6aeba39d147ed968e2f42b6c2b46364c1d8e6bd94 SHA512 0e74aac4a0b0360c0c4ee05a336c7d38b3525b0c3316f5ae40dd37c8b75273fb3cfc4dd227268c1aa1630c9371717960ef4063b3c3ab32e0e4cb3d1c1e169302
-DIST firefox-84.0.2-kn.xpi 506722 BLAKE2B bc64f458b047a77136804d91528bee7d02943191cb0719cf93e509c126d60c8fc4feef26b3ee2dfe44c1790c02efda267bcf93181059353fe1a166e0f3f303ce SHA512 4db1eeb88f7ce3857db4b92f803c4bfee2f63b00e2f7f6b8531384fce2c96f91e398f94319d41d694794c91559e75774e27b68b667558240a7c1aa61542fdf9a
-DIST firefox-84.0.2-ko.xpi 564756 BLAKE2B 02c3cb7e643cd15440e4e89c3e46c409f1b3033fac60fc26758f05e22b9f8d510911dfe389a2ccbfb3e86b22984d17572dae5e2e648d1b78f7c6e5b9d6ce6bbd SHA512 3e9513e0a05534cb0ff9ac2201ac1c2f28ee86c2a6fb73cdcef2a785cbbd7b51d1bb5747bc3b3382b6dd194460e9bc733933a2978697dfe5b50f2fe6f1394922
-DIST firefox-84.0.2-lij.xpi 476798 BLAKE2B 7cbb8cce2dc762a3d61474d6752cb12e4f0a2bb7cfbeb41be6c51ee5418a870e0cd8b03977e57f00bdfef00c7f6866ad28b97d664c2c163d2396830ce5d34c53 SHA512 be86dbdba51d143a8b56cde7ed39e7ea101a52d2b8dc5ea14dc1e135ba693b8dda6be0157bff90ef539b3a2bdfd74d01f65b3b209001f0626ad1b8562fe67f4a
-DIST firefox-84.0.2-lt.xpi 547540 BLAKE2B d7d0f09d8e4fff6518ff44e54df9fc9dcfffc8ab0576ef1ce691546b747f6e4f236b64e1b2758a7b42090d02ea5dabd62eb1977a51f80b1d5a7f830ced27e26f SHA512 f68b00eb135780593d403d80cb361bf720522dd80de722ed3ceab2879309cb74767c2333971ec71ef758b245b0f492eb0244a5f57b2ce37e86c22bde7fba8b7c
-DIST firefox-84.0.2-lv.xpi 470844 BLAKE2B 2aa799cb912efec64f2e4e2f0d99bdb7118934e3c3acfb6954fb96785aa0a0421c34c67b366320c53a2d6e9084f25f8ab62f736e0bfa6625fdf22ac8c075aea9 SHA512 72a6a64989e9a1b9459c99fef70ad7f689912853ec96bab5bb3228cf30580afddb81180dd876af6ea8766e1e4d8213c3368d8baeae7ec1c40eb69f2429c71ff7
-DIST firefox-84.0.2-mk.xpi 459831 BLAKE2B bbf84fbc9cefbbae8c30896a20c13c827d9bcb5e3924344752acc88df1afb6dfdd2793ee74d1a43f0a609b24efd6d2be65db441807edef321b9b5ec7e2644048 SHA512 9f7697c9d5d63b7a48733e2a10560d121954151b245d33360770bafbb87560e031a14d2881107a8d2fb1e11aea7e765491bbade58d9053aa9339843012b8ea82
-DIST firefox-84.0.2-mr.xpi 541982 BLAKE2B 518302ecb9f774f73d5b8e52a22fb006fc53569c2cbdd7a4f8ef76b650d8dafe7f77f44fd5c77fc7396aced1d8455fe5186dc70b88bda51b264ef2a21a4b4965 SHA512 e1bbb89f794c7ab8cbd17ccfa7da4f0de0d85983e911ef27347995ecda4672438da8f8d171e48ee60f4e99808f748b3e994304389eb137383921371a5a204c13
-DIST firefox-84.0.2-ms.xpi 454820 BLAKE2B 340cd72d2d1e48377fc820d579182b7602c60644e5227d64ffec6e89aedc92590dc5a5ea73a1c682ea9f1ad3b2dae5b28e3ecd04eae09b2567016f27de93f82c SHA512 8ccaaad2068e2ed427dc6a28fc4a794ab2fd382f0769cb70b7748feb634df16d6ae31afe6149f1c5494024422720a9cbb7de9ddef88024ebd316492047f91b99
-DIST firefox-84.0.2-my.xpi 526525 BLAKE2B 1d80978d0818e7b2c50f42d6688fa2617e24cbc61280152dc8553c9e77a5524af15fe3da5b27f1dc1a1dee7d89fe25078620e4c133721f011b4a06ba2162203c SHA512 fa1843eb90a107c35c8488618cf33ab1cb8a189739cd1bfe8f6ba37cbfa93e3f856ce16bc2a33075814abf5e5d584f41ac4c0d97916c2320c9a0c973c73f84ce
-DIST firefox-84.0.2-nb-NO.xpi 516936 BLAKE2B 2fe9798c3f4bd38f8bc713f4ffaab1eb8ffd29575260c28307fe65895f1e9f3688891881e6148c7057c6fe69771afb01db4b350af4424bb86f3a803aa0fa0c01 SHA512 8bdc88760db34517f67643c143430887981ea0bab807b0e0d70a3e838119669caefdb3e8ee4edd8196c13b875263ddd27ca63e9c33ade24c7d94331797aea19b
-DIST firefox-84.0.2-ne-NP.xpi 483427 BLAKE2B cb9305c4261c7cadc846b26e47dea132213c83f819f189220c7f44e6e3436f58a9ec09ad5f9abf7272a24f0ab70dd26f559ec2c916ca4dd6f7528f25da41f667 SHA512 f532b958edce98b6f41eb895048b5819f29057b7c07b11d1cf4b878e57ef94237fd36595dee5151d87234419060627bf16d8bdd430c2048613faca9abf07df43
-DIST firefox-84.0.2-nl.xpi 524176 BLAKE2B d9061179cf4496cb4fa92a233572825d551a4e65eebffea009a486715873f156b9da70908601276251fac27700190b0040b16ae67ee06e6bc09d4c155295bb4c SHA512 a692962353ad747c2cb8833c064b1cd7d112ab20f43d77953e71934b20d74ac0edddb282cf3163dc5d44bf5862b7352ec2c108144124557b8f035a5311166038
-DIST firefox-84.0.2-nn-NO.xpi 517877 BLAKE2B 9067ce22390d52489b602274cfcc0f3996a8f5807ab0fa7e97f032541ef967ef3ea69c7d26f16de40fcbcf6a0e647478b4cb0703c9dbf759f057c5444949f0a6 SHA512 6d43a5afe2bd93c36603539e6cccc215c3be2fd05e1c72572e512ffb7d56fdc0a5b4cdbea677a3464877ae766ace1c2dd9875acace3b036cea13536213a4b39d
-DIST firefox-84.0.2-oc.xpi 540042 BLAKE2B 59f24c9012413d773695cbb41766b578345e1e97850ace3be615eeab747ee9d6e2dc8bfc780e5aa7b6fac07d98e181fd30d6d990b6a78e6dc0ee92e9a9301cb4 SHA512 6f630dc57236817f2f1c96e5fe7d209cfda3ee577ffced37548e06d5e9e2c32f6841934b97a48bdc5bc9124522c34bbc4b89cb5237ea885ffff4fcf8bfb42738
-DIST firefox-84.0.2-pa-IN.xpi 584966 BLAKE2B 6299b7d1f69709395a78df5416e128a0408ee363ac929f703865c5883f33e4cdb520a794499b0c10437f6417e96dd52a5865e824607a685c043e5e9ac3deaff5 SHA512 6844017ff5522464329238fe959a60944b63ae856b168d493cbff3eea4e867cd9958e139b891b9f015aac068473b7333a1fb4f9d79de8976606a5e18324aba04
-DIST firefox-84.0.2-pl.xpi 543365 BLAKE2B d226056f838780409df3864e6e607db48260d5a79f0a067d09aa9b572cc4b5179dbd0cbc7bfbaabf57d0b6d925205541beef9823c5bfe17a6a65c238cf51d236 SHA512 a2fdae90b0fdd95ef3d2c732c829af23dbe40eae2fb822b293101ced541becf0104384ec10d5af4200c57b52dcada25ec8511e88e43c2b78d9dc10e139b99048
-DIST firefox-84.0.2-pt-BR.xpi 525584 BLAKE2B 06b0b61f6c358a426b67d63aaa6e938b5bf8cd91a92cc8c91eafbf3b78fee07d6902d916688aa4dd7e2fb2b28f7343b4d97176b2aa8dcea704e525fdb473221e SHA512 a84d1da0484155925d02e73e3d329d865ee56645bf4fcbd3dbdd2ee632c946350fe7bb6864f38dd36e310764857105ae862ddef0ab5ccc9b61244b2506b272bf
-DIST firefox-84.0.2-pt-PT.xpi 533302 BLAKE2B 9e59349329aec7d824662b2de90ea3b18a255941853b8d8f0d8619a079f5fb87fbfbdb5a245ffbb9f1af78aa990c9bbcac9e3f79b4bb7bc828251cfbaf567e7c SHA512 37d457000660c5a8d2b95bce9217b91ec38a240daf6c939e5afd2668ffbbd8ad4373e6cb49780212de23f26431581b9c971452634c4d49c3092ed4f2f64949ae
-DIST firefox-84.0.2-rm.xpi 524836 BLAKE2B 25afb490084157e1e45cf33135ba5a481047923cd899e91d144e12be0778a8dad74ff9d280b7cdda832debbc78c3922081b3486c21e51b3f11a4b5f075e7df22 SHA512 eb1dc215981fdcb3cee90f857fd16636aa1d20268a11c567353881a823a0a4bd151827b6cf2cf04ab194a2f470b6881865d5ea991e956a1898fc9a4c133aef76
-DIST firefox-84.0.2-ro.xpi 532974 BLAKE2B 6c0463476f0ab94919da8f4395ef73023c579d03be0db002c8b3d6cf64d0f8fa2360866a619eea93e6b4882d7b700989596c8ea915f0f2cc6fb96188c8f2b73f SHA512 bd1c9428a83395a40d03cf15f9af741aebee56fea855ca3f13ac480c93782566e9a21e3cbf5e69491e25b8b183f4be158f1eee4eee8aa9582a9fde6a770a6c56
-DIST firefox-84.0.2-ru.xpi 611905 BLAKE2B bca4adfff05114d9b6c832558dc6e21bac78133ab9c7f154589c18fa1454e22bca5c7fd807c9c4abca4e04757f293469275b64bed2a29669c40e336815a8f12f SHA512 eb96a3f183173928fa9186d35095c653c9dfeaa0805c1d9b02e972241bcc426e34f6dada73b508541a11225bddecd90f58ec032a022e4c585bce4bb148f85c3e
-DIST firefox-84.0.2-si.xpi 492925 BLAKE2B d26571324881fb460d956dc817fe6eb096188f852bc154ca2f350256fcca3971bb27ad5d41e09edb8d6f6c2559262253088dac879a57ad118d3f9cc1afc41acb SHA512 f1176bbef031af9fb137d2be3473474e6ce46e5f388df2d32f0ff84a814a959bc968b1523baa52a1ce75335dd53736518f7fbfc0b83ce76f90014d72b77aac3c
-DIST firefox-84.0.2-sk.xpi 538504 BLAKE2B f10eb835bdbf9d36001d74647683debffc09e785ceeec629d477556b47f0aa257054461c547054b30e410a476d5762edaacf3ff2c9c5eae1491813fa3f92cbb2 SHA512 8d61fcae369ee72c046636e48edf37fc523c54d350c2494b2a4946578123b03ce301d11e696b90817851d63ab49c90f9cd9ba801db4313f389303e16179b3e61
-DIST firefox-84.0.2-sl.xpi 521135 BLAKE2B 86cc4a9f6bee4e45249a8f9cbc8ef38296b8981691216af1cfcca0adff8e1887ba482a730e00f8e9e2048b7b666b6798449be8886a471bafd321200372b2029f SHA512 a96d30bd538d42ce755381e3a6f4df0f34cc624c197707b9ff23de56d60f97cce6d07523d43f28399551f4a1bc99a648e2fee6f4c6cd337dc86ec9f827770f1d
-DIST firefox-84.0.2-son.xpi 425695 BLAKE2B b6bb992ebb2b7bb178d45ab1b14d9a86401df6fce469e72fa141c8e3043615223e0255ee2ecedead4efe4f7d14a791009c5d8aa212d4791f30d60b81c8717249 SHA512 9df3e8c86b599797b902db9a9f80fdfb00d93cf1b54d99019745e8681383ef02f4114cb71a53bd50f5cf7c93762b3e477f08087b80f7a2aca931b47e6583d12e
-DIST firefox-84.0.2-sq.xpi 542777 BLAKE2B 6f9897cc83fa929deeeb82e2d13e1107d62aa5f0ecf214e3a653b6aa1902dc869f838a67681fd5cda8227c12f40c09b8f79a74044ef3ae42e52e7661a949f1ad SHA512 2aee453c23d891940caac01d40a64093f1d801fc8c0ee06789c22ce2b32b9b6a941f4c561d293849c3c9a48c085d102c93716a78a57c7f62d1bc8e0ba53eb137
-DIST firefox-84.0.2-sr.xpi 563743 BLAKE2B fd1e4cae5a682b051b657482e8d3e2bb418cfe632ad1807de3e68cd4bff65cf61b5b58702a23c937b8ebc985fa3be8782e7241090e8561274710c5fb22dd6c66 SHA512 db5d9b2717cc992699acf2a3ce3f1116185f86a17165d12a452a64e860a7f45ca98496ea9ac82787c3552c9b4f812ace99e01ff7da823b09871ce48902b280fe
-DIST firefox-84.0.2-sv-SE.xpi 527551 BLAKE2B 8573d9ea0ed7351d78c0ab3c9c008c83da28552b4f185c5af5fb6d08544048c80bbe9dee9c545b450b36d3de865d9c7ab7f678f2551bc466f5ca11f4bc583975 SHA512 655d32d1a5ee114e3de467a0195aa92d5186981ab229315019385143fe9407d74df014047b93e6f01ce7603ae494d140a8b675a5d8d8c390ffbc12a5ec33418d
-DIST firefox-84.0.2-ta.xpi 521662 BLAKE2B 6256aa75c8e84afbbd0744afdc0445b1bf5a192d6c22ea6e0d045c14c93d64f0d6e11f0a0a69f39b382dcac86edb5e44efb4a81cafa0ea9194ce2f0bedb5e798 SHA512 d2ef742357e5b9cadbe6dc96f5ce1117f27dd87e30e830a45dfb3ea4e479093ccf90906bb139d261a6b97a569abd982b1143b5db2d944d1b18df60b30b1c36d4
-DIST firefox-84.0.2-te.xpi 558096 BLAKE2B 8e387f1098f4d6cadcc4708628e04a315049b6673b75469951d38b1ad97fbc0aaddb9f6f5bafb1aca91ae338d05dd85160e9992ac8648cf4c7f363ebf08cdc6b SHA512 6d49099984b19ac7a647b57ece0659b66df90394c0840bc7f526dec8a34e56ab18e3e91380020b4f8570b36ac021d5121e394535c1fd425b052f7dfae33ff3ff
-DIST firefox-84.0.2-th.xpi 592813 BLAKE2B 451fbcddcda36bf9db8595a38116d70a769b82e6803c6c2a65d18b8a74b9e330fba1d69553fff82d3b6e3f37074c7a53190dac8e0e8277f49a3e0bee6ebd6496 SHA512 b6d908f96172e96f9c29ff76f66c22a358d9026f26d01fd92cae51daf1d62e76bbc0f05d7f8e7cbc7b1cf395469e2ed68eafee02ef5c513625c6b64a3864fc8c
-DIST firefox-84.0.2-tl.xpi 519344 BLAKE2B ebcffc215d6dbc888778bcfa9a2b7299f5b0a480d6f290d9d05e0005057f03fb7ee39988f2648c58d0ab980043c886f586c85c17c70f060a8ae0e5521a3036cc SHA512 180a6c1fa9d48d557a8231e1edc7494ebb8dea352bd22a725df754222f2f67e2cd397012c0a682b6974782a52dd944fbf7dd48a7f2acf02564c89d1b9781c5b6
-DIST firefox-84.0.2-tr.xpi 537929 BLAKE2B 5535a988977e464939d70f37e31fcdb78172f105c2e132bbb2f9be75ecfb4c869ba03f6f590e1f23bc2e56c806e53b84b32a2fb4fb4eccfe0b95e0efb3505dca SHA512 b46631fd88a49c646f5ce800f99f99507948aafa2b7a65a02eaa5d74141d5b095b3293b5209eec64844a07cfe51f2da450133b31c9db579e10f991325d6354e9
-DIST firefox-84.0.2-trs.xpi 500690 BLAKE2B 97d796f035c82a82df123125ec96b61129910c7511de3c5ed261ceddaaf0a2c550ad47adfa3bb9ac55dd2321465a13c15f9f41d7f7326e925399cc46ec96101e SHA512 db1e7c1578e3c7f9d393ab7889681475bf8514176c575815ed3a25054fff661e18a9d7ff4f4ed9a31531ba117ae56abc7363e7d65cc819a59bd47407b7e1edb5
-DIST firefox-84.0.2-uk.xpi 606066 BLAKE2B 35a57ba0caa37989a3ed0b29e37bcdd1bf7c4d7b62d41309d2a6c298db4ba7fe557a87a44ae8e322dd639d6e3732dcd0a206a8652bfab64341a9752e656f3555 SHA512 e7652494014118949ee79d504c03bf90f23d6caeca8c457294d87ac00189525fcc999a91b904d9cec57643599a12b533f25f20f715913f43c9749c433c098be4
-DIST firefox-84.0.2-ur.xpi 558467 BLAKE2B 53bd030b6f70f6616a5ac0bef25be2e90ff033621f3ffcd61d22e222c65963f0df2a68ff3e4dfe52762554e855d3ed9278b1857087ee91fbb576f711c4adfa50 SHA512 04cacf3287e89dd6f4b88300b96218a155746aefe6cf3f95a30aa5a0023f0831c321f16bb14f536a3fd32a636b88cff6e1692886d4a9d7ba67bcd0283a8317a6
-DIST firefox-84.0.2-uz.xpi 478519 BLAKE2B b5667800b0c5cc08a0dadf5a868e019f12a1b622610bc9092a2bfab8becfb6e3f195bdfd9a87bfcad3e054d92112a910b7808e141ea075dd0e937660771218e9 SHA512 63d546fdf69caa525b979da00045dd44b6f7fd745ac3d774f57d862e6a0a28477ac556b570d2866ef9799eb96eef02a01120e8de5c9402e86e9a341ddaced6c3
-DIST firefox-84.0.2-vi.xpi 561442 BLAKE2B 101049828718b0ff75dc38558b28efcbcaa29d9d8de4864e6bb81a3780c7547f50cc39996b4e8bc2a31ed0b2fc2a95777e7c5a35adb2069e6506f5e5ebfd05e5 SHA512 ee47a46d5532ae1a6642f6d252f7a2bd9b4aa61946ce212b9d5ff157402c547bd1a627c0be4b3a66ca17040daba4afe6129a1764c3efc39a0d93767da07a1772
-DIST firefox-84.0.2-xh.xpi 427838 BLAKE2B 3e233c26a53320328ed8557a37ec25a3950c873f495ed3c1d7c8cc5dfc1e685bc650d4a017d18de35a27219bbd475fe3d752549f797677cabc1a9cda78bfa39a SHA512 55156b9ee41f4e4f9e02249a0ed5cb3348f7db6ffc483ded1bef5d6d48cdb7ad1103e1ac1ccc0b56446f627976e384f944f1e4c60012dfabaa512a545ecb1373
-DIST firefox-84.0.2-zh-CN.xpi 562152 BLAKE2B 282156975c144ce18291a1a641f6497ff939b3fbb4fdf101663220134ce65cd32692c423fbcb34f2d60d4ef64439daa4d8ad1b3880d60c041f1ea6e6359e715b SHA512 f090ccb51e3f9f231c175be4b892bf7ccc89f943165fec99b5b7d5d79d3ed7e0f7955bad0e0a5590b7c1028efcf9ab7eb39b0f08e6ba4f9215f9d19788f4694c
-DIST firefox-84.0.2-zh-TW.xpi 562090 BLAKE2B bfd8e042d9e5a5b0c9ce39aba96e3d81a4082eaae0302ce346a4d44ab3417580d54805cbe272efca50c0eb0713c84bd79157c658d1a0f6d1d5670f47ee6cc8df SHA512 a06ac452846c183a90a53a43793f26271b051e0ff6379aeac6e2aa384c18ce7ebb0a2d1a4dcd4b37a7bc5357956766e5b0716951ff58d80ab07ca7b3cb33621d
-DIST firefox-84.0.2.source.tar.xz 363415420 BLAKE2B 94bafdedebb2d238e471e5f446b8e1ae1739a8f7e76544ec7cffa920b83db25722be5375899a10e871cc2fbbc136b3175b4e10ded8d428fd9625b28552d50020 SHA512 3fd4c9a5ec2409f23507b38c809e71a35aa674779dc5a7a2e3ff82841e0b65ead29d38ac4d5b17f7108479ed7338b3d2b40cbcfa9c51e01696634166d92edf99
 DIST firefox-85-patches-01.tar.xz 23068 BLAKE2B 4e9532470c250ba05289ec215057162a780212d944046f01ab907eb6c0e3941b8016b1a2b81e1971dec52d84383fb103613629eb333d25072c6a76cdca56c8d9 SHA512 a995fda3e38238643270d126f96086c64bca6d8c96f7a3a5ef620730cf449613f2e0d8cc3e918d4f9daa996c25b252452de8e0219041f14bd52835ecf88018e1
+DIST firefox-85-patches-02.tar.xz 26288 BLAKE2B fda7d7639f530df2d03e2af53a3ff1ebb5ee6b41cb5efe21256255d5a302369da55095ca0e39d2bfb2de527700dc6890286bfd2d1703fe44f2dd4b6cd8c6fcbd SHA512 77a2961c87753bb27937da7bbd2706054510a34c87d7ea68c0e490396a5ebf19cc85c7c507100249a0fb26c2d43a1c0bb3497226be025e4d4d43370d55273c15
 DIST firefox-85.0-ach.xpi 461933 BLAKE2B d1f93af47591ee08750afc8bf85ab00eb5ef635bb9d42958db8f0895ed364c911eccc49a17c7e9d49011c1e8c3b8c09538aef85e204f0aa7f20f68f458a61464 SHA512 4b77fa937f9533651575a0deadf2be2973b1b472a21490483e2742455bedeabb6de287e1fb4d6cbfb37717dcba73c18628663839c0f6c45281f954a30b8d5dc8
 DIST firefox-85.0-af.xpi 427614 BLAKE2B 66e9b75a14ad91cbc0658db0b7675851633e98341d821fb0cf38d65c403939ae59ece86abb4b669cf8900122ef3f7b6b165738317f0b9dc077456823740d5771 SHA512 90d1450f0c0dcdd77e99a661f8b9129c6dc385dd016099f44a94434fb92217dfe270cd982d01e095160cb2bd5870e16954b6b28160ae61379d94eaf400ce78a2
 DIST firefox-85.0-an.xpi 509100 BLAKE2B 42387657828f41570e02dce8b0a57487d1ebc06d10a99c7c773c7384ae5ec9664002390fcee642da09d4f4b6b9b78dd4f096e52b19cb173e2fa3f0ef4ca29139 SHA512 cd9ada8fe64c13ebb12c0932500cc88ac49b2e4ff42ca39a8373d9494f41d7beb8a00c127ba03fa820dc05dee086f8f9f1b45f4e68741689fd5af8a09f975507
@@ -299,6 +203,6 @@ DIST firefox-85.0-zh-CN.xpi 563314 BLAKE2B a42dd3dbf51d3afc89044b65af505073c8343
 DIST firefox-85.0-zh-TW.xpi 563119 BLAKE2B 25fd2e8d62ff8302df955201ff7823dec6b8f1f2201c38545673e62943f05ccc27bcb68b719830a4b7970c8063cf5d6ef6b693cccfa6057cdf202c6626817e43 SHA512 a982be2de34d8d417dc7043c6066d5ebcfe72381902a0dd9d4bc7240ace75c00f8a1e211f4ac8206b07e38c654247e62f256ac6774bff55f2fd45053c7e2ba73
 DIST firefox-85.0.source.tar.xz 378300292 BLAKE2B a40cb2741bde008463b0fafbe40889857b9c11adec5f4f3d8918013cd4eab87dd45789d67aa66bf9b3a8fc2b9cf6c458fe446a49bb20a2e6b29ca03d47a5dd06 SHA512 a88472e66baab32d98cb9d13d7dd3c41b47a697ce2a42209612d2342bd6c1c26cd80cdd8905a4cecc72895f155df09762735e8af24bc6156663b7a14e890be4e
 EBUILD firefox-78.7.0.ebuild 31836 BLAKE2B 85d6fd02525e4372e70a268b02edb5c687b2b34ff7ae45550104c5caba3540beb7af2e8d2b172e030bf6e8f84ac3cc286dcf2af97485d5388680fa7044b45296 SHA512 4a50f19d77213b0f3b617c0a6f5ccfa1c83169882d67aeb35c6aef37c8c970d8fdc2b88d391ec81e7813deceb272ce8cb8bd9a8313e6fd0184b871658aa99cb9
-EBUILD firefox-84.0.2.ebuild 31571 BLAKE2B f495b68915259361c14969d6bcbc55a3584634a6fde91ff8c119838e5ae87168522a0e340b699589dd842d25077a41bab062dfc32c3a6840d3200df57d1e3970 SHA512 e51106869f71ed918e9312527cb9b87f3dfcca43b270d7e960b94d34974a6e7016550abf5db05427b33e486705280e3d0f92f4de4e70ab893a696c34479484e3
+EBUILD firefox-85.0-r1.ebuild 31569 BLAKE2B bf1c61c960a82cfc9d5438465030c9dcb970284976703720b497e4c6ac3eaaf9866a3ade113981cd1289c67e3027eb80f19bb569af9ab158416f535fb60e40a4 SHA512 a18efb6b961bf60945e10121d79a973f2af854991433a41a428cdfbeeafb21f73441803e4ce0c4ba769c3b43a9912e30dc0d42c6c69d45e97871eff65ce97416
 EBUILD firefox-85.0.ebuild 31569 BLAKE2B 80ecb18bb349b170e11530e5c84e6ab08cb57e2bb32340d1c16b32da1851322c4d594347c9caaffee296af05d8192a3ce83f2f582e2c02dd134eb95e9f11e29a SHA512 ea4d39e1dc399b0f644997799c16de823ef21c3f9d9269ad48545f5277d20fa3f947d42adbc4ad8a9ad2ea2893a187e6aa1ef4ef3b0acc37ccb02a4773445934
 MISC metadata.xml 2063 BLAKE2B 4c632fd591403d8045cbf3448fd459d82b0433351305fb12322b6a1157c279311ad1a9fcba9af4576f336035f841a95b82ee7a5602d62f1b741748df7443a861 SHA512 75bb3db236d0941e6632def252cb0b90cb374fc4f1dd66e499522e446c5fe8186f57a9898cdade933da205c12b0e70d4e1bdec0d8bfd9689d37d03667eb92f5f
diff --git a/www-client/firefox/firefox-84.0.2.ebuild b/www-client/firefox/firefox-85.0-r1.ebuild
similarity index 99%
rename from www-client/firefox/firefox-84.0.2.ebuild
rename to www-client/firefox/firefox-85.0-r1.ebuild
index 17d0f3bd2cb6..630048c6cb72 100644
--- a/www-client/firefox/firefox-84.0.2.ebuild
+++ b/www-client/firefox/firefox-85.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-FIREFOX_PATCHSET="firefox-84-patches-02.tar.xz"
+FIREFOX_PATCHSET="firefox-85-patches-02.tar.xz"
 
 LLVM_MAX_SLOT=11
 
@@ -75,7 +75,7 @@ BDEPEND="${PYTHON_DEPS}
 	>=dev-util/cbindgen-0.15.0
 	>=net-libs/nodejs-10.22.1
 	virtual/pkgconfig
-	>=virtual/rust-1.44.0
+	>=virtual/rust-1.47.0
 	|| (
 		(
 			sys-devel/clang:11
@@ -110,7 +110,7 @@ BDEPEND="${PYTHON_DEPS}
 	)"
 
 CDEPEND="
-	>=dev-libs/nss-3.59.1
+	>=dev-libs/nss-3.60
 	>=dev-libs/nspr-4.29
 	dev-libs/atk
 	dev-libs/expat
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index d9605ec091a9..cff32ab65bbf 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -2,9 +2,12 @@ DIST opera-developer_75.0.3925.0_amd64.deb 73581348 BLAKE2B 06eb0592c92c07cd6eaf
 DIST opera-developer_75.0.3932.0_amd64.deb 73580520 BLAKE2B 0ede121d06b8f3b8c90d190c66b2610986f3b011e46837541565a12c2067f61aa20f021059c04be82b53826ddc130dc4c1abf218d275e0ac7632d61b20b958a5 SHA512 acfdd983ef01e02884576457c4e45236dd059938b95d88021889b0bb141aabae6ddd1157126b4eaa9407c80610a4a4a75097bbabe8bdc3b68f563e41b03f70b5
 DIST opera-developer_75.0.3939.0_amd64.deb 73827828 BLAKE2B 008a956c33a885457b3790596d97339a5e8c70371157fb3a1f3b83e7791e7a59f9cee265f24a472a2373a8c4abed23bf109abb34903d1e041377a16ad3355e00 SHA512 f9b05bfe46960aed7f3325cfe149f607e98df9c8b4b780c13835fecc32180a8ecf6177128834442c3aa6fee392f61a0febf4a59503290e31d643f43bb0c5eedb
 DIST opera-developer_75.0.3946.0_amd64.deb 73814064 BLAKE2B 29ae148f5f254d7d1c5807a309e24f0339a6ab27471df61f855fea9871a18cd04087733f731277c3fd5b1a129a06a7de7b83350b5ecb9c1f870bd5e5a96dcbbb SHA512 658fbc410f095465e77f09b9350ea3bb55fabefebe0461616af9a95d1fa85b795a34b4f079151b794307f347b44e4770153da09169d90a97966873361133a09a
+DIST opera-developer_75.0.3953.0_amd64.deb 74965200 BLAKE2B bb542fc2819b057befdd3278d791bda15bc4e22415ceeddaa21a8b155396708f745897f6ac4e9f3d8cf627940f8b5bcf619c49a5a36de38075768b929b0e1e1a SHA512 b8c54399aa5fe668242b11a07ae047920ca5c170511f6b8721ab6d5dbb9872d61ab5be73fab78c9e9c543d9986f995399b415060c2f6fff554afaabf22fee1f7
 DIST opera-ffmpeg-codecs-88.0.4324.27.tar.xz 1362668 BLAKE2B 0815049dbf95996a04a072ad1b82664ef594e0ea99aaea5ea9d54448457bb5aa5c6d9cb95d6c84a14ca64a29e0a2e9c6f5315a1988eb577ad02cc7422fe0f886 SHA512 cd1857d302c413a52433839103a3a268a12ab255ad8d6e651e872f7f28b61e1426e3c2854fc9a6acf4430be9fa8fea939de288c800cc3c60696394f77d86146d
+DIST opera-ffmpeg-codecs-89.0.4381.8.tar.xz 1427048 BLAKE2B 6f92f8582663b46875f4a3d9b0b80b14eb8b361b23699bd5e10319c9b16b26a436cd710cec684a818189eae4892fc41daf2b3387282926e964d4d395a1c7778e SHA512 7947eeaa361e78d1a69d244727ad601719fd4e6d6c284b1655e9fd9c74cf718f42ba3e0d0277f96a7b9cab984d743ea190404e2f74b5e1a6b9bd244e45b71e77
 EBUILD opera-developer-75.0.3925.0.ebuild 3300 BLAKE2B f89b7cad4fb5ef0cc4d242082c1a1b6bc234a2340eed7fe7b9d2973051e1e4d865b4ad3649ec9ea1811284652786b1082c4e3ab1ad8a8c8f0a6d8bb72ac8cdf4 SHA512 f0a83ed9726062bc257a2fbec0e3df2099b03de555df4d702b224e3af5a44723901a0f04f9d74dd8303885e2a34cc41c0474a42495527a016188f0d2b9382173
 EBUILD opera-developer-75.0.3932.0.ebuild 3300 BLAKE2B f89b7cad4fb5ef0cc4d242082c1a1b6bc234a2340eed7fe7b9d2973051e1e4d865b4ad3649ec9ea1811284652786b1082c4e3ab1ad8a8c8f0a6d8bb72ac8cdf4 SHA512 f0a83ed9726062bc257a2fbec0e3df2099b03de555df4d702b224e3af5a44723901a0f04f9d74dd8303885e2a34cc41c0474a42495527a016188f0d2b9382173
 EBUILD opera-developer-75.0.3939.0.ebuild 3300 BLAKE2B f89b7cad4fb5ef0cc4d242082c1a1b6bc234a2340eed7fe7b9d2973051e1e4d865b4ad3649ec9ea1811284652786b1082c4e3ab1ad8a8c8f0a6d8bb72ac8cdf4 SHA512 f0a83ed9726062bc257a2fbec0e3df2099b03de555df4d702b224e3af5a44723901a0f04f9d74dd8303885e2a34cc41c0474a42495527a016188f0d2b9382173
 EBUILD opera-developer-75.0.3946.0.ebuild 3300 BLAKE2B f89b7cad4fb5ef0cc4d242082c1a1b6bc234a2340eed7fe7b9d2973051e1e4d865b4ad3649ec9ea1811284652786b1082c4e3ab1ad8a8c8f0a6d8bb72ac8cdf4 SHA512 f0a83ed9726062bc257a2fbec0e3df2099b03de555df4d702b224e3af5a44723901a0f04f9d74dd8303885e2a34cc41c0474a42495527a016188f0d2b9382173
+EBUILD opera-developer-75.0.3953.0.ebuild 3299 BLAKE2B 98c3a228079d3272aa52e1f84a99f66e008488c8886b096b57acb8bb0684173847029785a720881aabaf8fc7699de6c75ddb52e32859e42a9e0d7ed4030cafb4 SHA512 c0c0397c2e7f814da0120c065cf310a2b5aa4a160e5626e4c7ed0f679d9be6c9f36a41a28e8d35b684deb0caa57218fb7d1f72970c0585b815bd6ad2ab431036
 MISC metadata.xml 477 BLAKE2B 11beed348273a9ff128136eddd7499da5e0f8353d22659893aa613d24e2a79ee37cfbfc62aa6e0dcd77cff8f5df6015ff0374e01768f34fb0f68492675ba2f8b SHA512 7530db21f8c1b251d8c255a8cf7771f13323defccd76698e577591b676978d25cc3208709571a6e754b3be3b76c2e6e562ae1ebca42f8c5961b25f5771327afe
diff --git a/www-client/opera-developer/opera-developer-75.0.3953.0.ebuild b/www-client/opera-developer/opera-developer-75.0.3953.0.ebuild
new file mode 100644
index 000000000000..e4d998d6b855
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-75.0.3953.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
+	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 multilib pax-utils unpacker xdg
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2018"
+SLOT="0"
+
+SRC_URI_BASE=(
+	"https://download1.operacdn.com/pub/${PN}"
+	"https://download2.operacdn.com/pub/${PN}"
+	"https://download3.operacdn.com/pub/${PN}"
+	"https://download4.operacdn.com/pub/${PN}"
+)
+
+if [[ ${PN} == opera ]]; then
+	KEYWORDS="-* amd64"
+	MY_PN=${PN}-stable
+	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
+else
+	KEYWORDS="-* ~amd64"
+	MY_PN=${PN}
+fi
+
+FFMPEG_VERSION="89.0.4381.8"
+
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
+	proprietary-codecs? (
+		https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
+	)"
+
+IUSE="+proprietary-codecs suid widevine"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa[gbm]
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/pango
+	widevine? ( www-plugins/chrome-binary-plugins )
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="opt/opera${PN#opera}"
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "opera only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	# move to /opt, bug #573052
+	mkdir -p "${OPERA_HOME%${PN}}"
+	mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
+	rm -r "usr/lib" || die
+
+	# disable auto update
+	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
+
+	rm -r "usr/share/lintian" || die
+
+	# fix docs
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+
+	# fix desktop file
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+
+	# remove unused language packs
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	# setup opera symlink
+	rm "usr/bin/${PN}" || die
+	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
+
+	# install proprietary codecs
+	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
+	if use proprietary-codecs; then
+		mv lib_extra "${OPERA_HOME}"
+	fi
+
+	# symlink widevine
+	rm "${OPERA_HOME}/resources/widevine_config.json" || die
+	if use widevine; then
+		echo "[\"${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm\"]" > \
+			"${OPERA_HOME}/resources/widevine_config.json" || die
+	fi
+
+	# pax mark opera, bug #562038
+	pax-mark m "${OPERA_HOME}/opera"
+	# enable suid sandbox if requested
+	use suid && fperms 4711 "${OPERA_HOME}/opera_sandbox"
+}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index f462f7a176b1..802a599bfd1c 100644
Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index e52f745cdf50..7c03ee19b839 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -8,6 +8,6 @@ AUX xinit-1.4.0-startx-current-vt.patch 740 BLAKE2B f5ac87b96f76bd4c845cde4844f9
 AUX xinit-1.4.1-move-serverauthfile-into-tmp.patch 745 BLAKE2B 6a964926b4f5eda566be4ff5c0f015ca2d3a9f39f16ba5af0cf3816c56cf458e616645ace1b8be9873c604322ab56b118a7a9e531533f8617cb647a57cf0cf3e SHA512 0fb93f0cebfd4091d7e58139ef375fec931392159b3b060d699d118c89d4403fd5cee82cd35582aedf7dd752aee495724119f864b17988d0dd9a5dfe76c88ce0
 AUX xserverrc.2 143 BLAKE2B b33fac4b5ba731c79167d21a07840c46abfbb33e8fbb80aa1c3f23a8717f836819da3a947b72bd99c7a14516534e9771033bcd1e26d167f2f7083be20eae3b2f SHA512 61afea54f66b9f397860e467cf87a41e1d9f97d7194930bccc254e44dd4178bca7b402bff7aa2a1d6f44a91680f3f1ee10a5b57e527aaff80438623edc1b07c5
 DIST xinit-1.4.1.tar.bz2 176206 BLAKE2B 1c20f34db344eb967ac230a0cd61ad07d0089668aea32973e9b8b9749e5260ad5d93a7f6642a4f2c8d6b01870696e4e1e422790c2954320039aa85e6dba8870a SHA512 6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340
-EBUILD xinit-1.4.1-r1.ebuild 2230 BLAKE2B cecb1f7cf301cc70564aa2adc11cafab9d7b22660e788046a9c9cd10604bee19c33e45ff56bce1ff439baff2e73026decd76edcba537bc79fb5f46f19d5f7881 SHA512 9af54fc6b56ee5a55bf8153e01d5fd386cb4d0e2c95bc5c81b79b28bb692522f838b6a62586d644946dbd92cb9a3487a3c6b008e76a1f3f43f719c915d8eccb5
+EBUILD xinit-1.4.1-r1.ebuild 2229 BLAKE2B ff6cfc7e1d8a11e55cd7c09701a2864df75f07c1575d18db689272be47748c643f8e73cb44316d09b28a289db492b888701c7793dfbf2b287b715e509cd2613a SHA512 9f688323e0053b4712d2f8ba50ae3f9f1cd9c3e6f072bee0a3ab77e0a29f7c767769ac56ec4c0ca7f9dc82d99f00c1f63634edbdfe04a4966c0bec98247b6e12
 EBUILD xinit-1.4.1.ebuild 2247 BLAKE2B 255cdfec15b4a47ac2fae1651eaaa1fa41f3df5b21789e06ae4e99be9fb878affc279c37c80468566791432e268bcef75db72ecc67ef86eb33b43b929535da18 SHA512 e2730aa19d65b4c841fd2e0d57a55176bef218a9849ec6d11956b96166c527cbd0dcdba69ca50fffb856103ed60ed88ed57a8cf1e605cb8258b6b58b4b761c34
 MISC metadata.xml 477 BLAKE2B 96cb48063d5da3ee74d3c6080b849841fb1b276338db584d51bac71b5b2c3df0ecd876055a3c11e18f46c4d879a90ef91713166cae2aef65ea7725ab639b116f SHA512 c3e1095f0e3e017439777b3113d16ceccdc5ee7127da7f9e994126d6f51227a07c831e082d58c9c094aa6fed3e789458a212e27ec497fd3a14ba4cc5e4956205
diff --git a/x11-apps/xinit/xinit-1.4.1-r1.ebuild b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
index a5d97f4e443f..5cf39d121c81 100644
--- a/x11-apps/xinit/xinit-1.4.1-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1-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
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 884de992379b..bec25cd9d7c4 100644
Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 796b51f001c3..ac3c4dceece4 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -5,7 +5,7 @@ AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1b
 AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-1.20.10.tar.bz2 6307058 BLAKE2B 13306e5f4f7f2b4531f2af5103337defa1d441bff78f20ea4d564a7d046ee546406812b6836fe94ca9323189382754270989b2ac7ded8950ddb2b15562c6ff21 SHA512 a07bee380bb72f2117fe6f831a6e4aded19bea1f2b36e42a019a30348e98d6fe65c0617cf819be9c6b405502f88cafb829df30aab32393774b71f1418a4cefae
-EBUILD xorg-server-1.20.10-r1.ebuild 5467 BLAKE2B 5b0b906afdc1858e2705764fdf88528a5be175e628ce5501ee386a84700bcf733800d679a54d3d4d82c97e9a5b949c29da48dcf137ef838aef616f7cb40fe103 SHA512 3b44ef0fd1f0b3ae4a779014c771a4e689e758eb895726f72f337ca6f7fed5605c0cbca3f9ef837cfb1c1c4b1aa3d8e9bebd4f866a41c0262aaa0b1717bf8dc2
+EBUILD xorg-server-1.20.10-r1.ebuild 5480 BLAKE2B 0fddbecd6eea3d0aa6ac7fcf7332c526308d299f925dad9450205086baee30f658e60fa501acabf8124699ec49375fef39b954e125a812fef686382a9ea63dff SHA512 026c7d64f0b874be3953cac6c4da3d5eedcc4941f2d1f0fb270cc3e8256956763fcf4b6f26bb0339ecd0a7ddcc8a7d1bdbc0bc60f50400b1322c8815653aee1e
 EBUILD xorg-server-1.20.10.ebuild 5563 BLAKE2B 1abbb095202d9aa26f6b3bc5790b4c82640ddb90b1690c095da1400f1a7f9bd8139809143d09a80af356edf426f763ef21419498e6f3439828ae65d8b63f04b7 SHA512 55ae1a5708751af8a09f3484dab6b2f18cf29d1ea4f93206b5e4f4c95a900e9b79552be2d6b04f72a5727248cd121e47ed1967b214f5a67b583d39f7a9055d20
-EBUILD xorg-server-9999.ebuild 5464 BLAKE2B a47f4222d25a324299dc8a81289e2762d0d6ec6804c3ce9179c8e65f0f2bc2d10e51ac00fcaaef80a191e67ed9a97aaa3acd7b24f030c572872dfdd66ff56572 SHA512 54daa5ef4197bbec3363b27c9f8b6c47b2627f98326b9eddd54dd405ae3640f8564adfc1cdf95562f123aa46e13f121314777e12f3592019fa29b62fcedbf67a
+EBUILD xorg-server-9999.ebuild 5478 BLAKE2B 7024d4059dc0be8c9ac24e9a6095056607733c38f47624624eeabfff60ec355cb4048f5e155ccd71f1c5191477e8523930e0c0d3f7c5fdc5164bbaea23b4988b SHA512 1f0d6e589a6bb5dc312901fdc963b892e728cd464d659ae019e052bb67f380410e624adcd69cfc882196478b35e9299e262882ad060cb0871d93b1fc3b8418a3
 MISC metadata.xml 895 BLAKE2B 03b64d8a77f70c326650f17775d8c605c1dad44529330d26daee4136bd36e0f53d79212a7038d943795dbc5772dbcd52208b762aad42ed832ebabd848e5fa15f SHA512 fcee97e4ee4b1f972c4bea7626a719aa4d18b75b4475554327369349d5f42c0b1a3b8fb513727751b9703cfb9afc34fdb073cf19e116e7c5f6fad9b204574a5c
diff --git a/x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild b/x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild
index 4d2f85351b5c..40e397af55a3 100644
--- a/x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.10-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
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
@@ -100,7 +100,7 @@ DEPEND="${CDEPEND}
 	)"
 
 RDEPEND="${CDEPEND}
-	gui-libs/display-manager-init
+	!systemd? ( gui-libs/display-manager-init )
 	selinux? ( sec-policy/selinux-xserver )
 "
 
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 3452ef412c49..3859aea5e219 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.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
@@ -101,7 +101,7 @@ DEPEND="${CDEPEND}
 	)"
 
 RDEPEND="${CDEPEND}
-	gui-libs/display-manager-init
+	!systemd? ( gui-libs/display-manager-init )
 	selinux? ( sec-policy/selinux-xserver )
 "
 
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 81ded7fbc6bf..e3c6881a55a7 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index 7457dcb79506..55d04fc78e15 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -4,5 +4,5 @@ DIST albert-0.17.2-pybind11-2.6.1.tar.gz 634179 BLAKE2B 33f057e88e45985a0475783b
 DIST albert-0.17.2-python-extensions.tar.gz 483617 BLAKE2B 34a1b8626c17d0297294be5cd77fe3f9b4abd985541bd995d1665e5e4a3a9dd64b393c5aba6f00347e0a4c031df2a04672246caff1038858df286c271dd33975 SHA512 13e14ce180787cde9abd0c06970109d9217f67e0b4596d73768efb1a183f6493552766e89bea6fc83703a4c0cc1b4961459cbbf5953c530d2c09d53e686ccc53
 DIST albert-0.17.2-xkcd-python-extension.tar.gz 729219 BLAKE2B f3c571bf2bf97f43a5aee7d8201f16732e12b589c8f7bfd58fe1ce138d728ba7416fed7eb203813922a5be5b3066f0c1d4bff136c61d480146fcf5da87dceb35 SHA512 0cdedb94bc82c2db8f3006efe43a084c098414aa711ebd88a011db6f1ef892f8114a73761d8b2f2a1d1be4603177f957eeb41ee642e1c31460d1507bca6fd402
 DIST albert-0.17.2.tar.gz 72652 BLAKE2B af5398307bf4dce928cfe92766551c761c407d9d98cc0a4b730cc8e95509d15c5b8ccfaef6e19d3dd2ded5e56403b14c3ac08fce90845abdfdb74ce7b3ff8b71 SHA512 ce2e32fa0018b210196e09cda8a3cce0a2cafecfdef5edae4610c621c39b66e3b4b039449d1900deb9689b5fa14178d079f7f0a7917cc1019d26b48a0a3ca415
-EBUILD albert-0.17.2.ebuild 2730 BLAKE2B 92a1744717025de8f2a198ba2da7587a61d619642bec5300df737d24978fdf0c650096939830466afd067c88346c295f77e3bf59f0a87fd83fbd78754287da62 SHA512 f6608ffa18cf6be400c7bf36c38860d105a52340d16bdfed257108d31c4466ec4547d9dbd8a9c226fb844244f7fa60e42e6f0037b1dde102e30016410ad9c2a8
+EBUILD albert-0.17.2.ebuild 2797 BLAKE2B d1f12440c3a672c02daba3f2bdb54d54822e78b6dc80bd83b47f47614c5d52d864547853df123b80ceaf6afaabbf1f1ace0dc44cc4bfc585e7a8a689b4b5dfec SHA512 5caee7a51cae769f9acb510bc66d2dbfe310b3be02146c3b5b2cccd1786cea484c0daafa27b49d9829492459b70758a669748a9423f2694949eaf6a97a466549
 MISC metadata.xml 745 BLAKE2B 7b15716f944a6712c6aa1afe34307ca1bfa8587150df5e71d2af0b8fa96b95cea669c8e1b6c7af75667f44035869e8f8f7674837660c094bbd6e1e710940a095 SHA512 573c724bcc935bedca3beba49c89b214d54f690f4d56df73d90f9dae1a2f80f72cad75d4dc4a9166e33c71ececa571db016aa17170d3c6b864288eec9bc85a43
diff --git a/x11-misc/albert/albert-0.17.2.ebuild b/x11-misc/albert/albert-0.17.2.ebuild
index 58b5b30d0b47..037b2adeeeec 100644
--- a/x11-misc/albert/albert-0.17.2.ebuild
+++ b/x11-misc/albert/albert-0.17.2.ebuild
@@ -27,10 +27,11 @@ SRC_URI="
 	)
 "
 
-LICENSE="GPL-3+"
+LICENSE="all-rights-reserved"	# unclear licensing #766129
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="debug +python +python-extensions +statistics virtualbox"
+RESTRICT="mirror bindist"
 
 REQUIRED_USE="python-extensions? ( python )"
 
diff --git a/x11-misc/i3blocks/Manifest b/x11-misc/i3blocks/Manifest
index d8c7b5ca340a..f6fa151fcab0 100644
--- a/x11-misc/i3blocks/Manifest
+++ b/x11-misc/i3blocks/Manifest
@@ -5,4 +5,4 @@ DIST i3blocks-1.5.tar.gz 66019 BLAKE2B 0378dac61d2f0049dffefe2a3f98512518aef311f
 EBUILD i3blocks-1.4-r1.ebuild 769 BLAKE2B 871a9eb5cf632c053ed5795047fa1b87b8a16519e9892a96f6ceab764b28c4b2808cbc28afe9f869fe9868a8ccc295ed65b87d38c74dd81d1e9beb771174b104 SHA512 a54bd1cbf1464eb5b7ddd72d1926aec330943602bdc346ab4e74ae5c4030365566dca85d9afda23760a8e66514fcda6172b7171fa063672c9db61d7428aebfa2
 EBUILD i3blocks-1.5-r1.ebuild 765 BLAKE2B c5f8ee3ed8bdda27469431b703e9194d81c6acbe7f1772d05e100a7ac150ab7b30d274224c620a82e409c3146d6eb760ccf0f9b7f61e75f6d6083cac922a3c74 SHA512 40a1abe1ee905d463bdcf8db3f5ff602b910fe8ef9fce5bd436c6733f96c8873338a65f914a84b85a335f584423624657ec1d16ffd0dc143b2f9f78725da00ef
 EBUILD i3blocks-1.5.ebuild 699 BLAKE2B 2ca090318052d5c5fcf03d5b0b4ed896217a81194800cf07c00f7c8d47c79424438678eef5d5b1fb7b1c6c0d4982fbc4277dfdf8f4f417a8939b2ea775594d60 SHA512 7693bce42f2959023b3601e4f10da5ec2351e85bb4271a2192a14eabb45f6515a57ad21ddfe4931019b1d7109691ee544d595bc27ae8a3d68abe4b59bae34058
-MISC metadata.xml 400 BLAKE2B 306658e11cb2e3dbefbb4f79cb3d41137a9f70d2a2ad9e63dcb90d1663a3b3d3220a09f3a29ef451a4191f73ccca8294dbd96225da5c13f2186f6e1ddc8dbfe1 SHA512 43531d6c06327673e8cdf74fee209b01dc17d1c50f54a24a793fdbffde4069694502da52013ceae37dfd57c52bcafef530a36746d46e2931aba93c2673647d07
+MISC metadata.xml 316 BLAKE2B aa34c53c3f3d6a1742c4623a61a4f7df5db9f9e65dff7a18cb1b4a19b754fa393646df846384d7aee3776c63b6f8e35f163930d08ce8c5da0c71173b9167f4b4 SHA512 c01965ad389d7fda0a0ec4c78136b3d9854292e253cec154cea32840181522aa86153440690560dc4fd4f9ecba09128f3a4c5fa6a88904c580bb44fa12e61791
diff --git a/x11-misc/i3blocks/metadata.xml b/x11-misc/i3blocks/metadata.xml
index 2e726d1c36a9..911888e226df 100644
--- a/x11-misc/i3blocks/metadata.xml
+++ b/x11-misc/i3blocks/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mudler@gentoo.org</email>
-		<name>Ettore Di Giacinto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">vivien/i3blocks</remote-id>
 	</upstream>
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 3e0da9d74f9a..a0250f031578 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/gtk-engines-unico/Manifest b/x11-themes/gtk-engines-unico/Manifest
index 0fd5e6c81c13..12599223b50e 100644
--- a/x11-themes/gtk-engines-unico/Manifest
+++ b/x11-themes/gtk-engines-unico/Manifest
@@ -1,4 +1,4 @@
 DIST unico_1.0.3+14.04.20140109.orig.tar.gz 19416 BLAKE2B f34ed477406acb36cb9533218d0fdcf57418fc25ff043ec90d2aaa05ee3ad8fe4e3c430d83001a0e399859adaaf720ca2b3d2e6d70543c460f367cbe03529c0f SHA512 8112240d63ffca2cbbaecc6731ef446153d8dd8b2b100c2d258013faa20b683761ba4768e71e91bdc885d1174874341e68400d1d3ebf95dc92db47cca7221de5
-EBUILD gtk-engines-unico-1.0.3_pre20140109-r1.ebuild 1115 BLAKE2B 2b369680b862bfcf0fbfd610095ef5ee6c1e627e96298c83d4dc1c0c67e9a3d31780d0bab95db4a111c78396bd724769d021cbb2914423f8fb7b6d188e09c7cf SHA512 4375087a092d82ee77980d31a0334847cdce563746ab567c94d1747fb25a51433d2b06b4ffc4fae18d6c3c616ddadf13262e76cf1720e3faf28e920f386d43f3
+EBUILD gtk-engines-unico-1.0.3_pre20140109-r1.ebuild 1114 BLAKE2B 1f804554ce3d3cb08365dc8d13112629883e2dab57d5959e8b5f4e9774b67b007578d18a4af6e7078873ae53e0405b4819715a2c284c93b34aefa2edded5c729 SHA512 40c1477ef6ec2758d2266033cd1bfc8e4f46330242402786a351811e93e9f36de9bf96098c23133a9b077cd3e690811cfbcc7576f34492703480bc6c19b94d54
 EBUILD gtk-engines-unico-1.0.3_pre20140109.ebuild 991 BLAKE2B f7ae6886ccb1420fab51c43b03029c8a6e71d2c344a4ab1ed083777c71ec8c178320444107b1503258e3f6e8537e890a866001b47209d478d4e44e3854e6bdb5 SHA512 34e814cf5af7527097d5571c32982b169193f6a58583afec69ba8e700fb4d445ac6945025beb8a996d16ffbdc1342364a5c4a3887eb9904760a369e44ccee0ba
 MISC metadata.xml 327 BLAKE2B a1f9e9275d1cc8493acf4651d23e41ae74410d65be0535398fecb4a881ceb8c5a81487a7e09c4fe0ee04f80d159ef3fe1403a8f4b3318b53279880cb319a17d0 SHA512 50637d6e2095fd5da68a15cbbb984c66fdf50301f32d036dfa38600f517f8d602093506b1e294fca5e041c219e8e41803cf011dabc71c8dbc17db804b91c6370
diff --git a/x11-themes/gtk-engines-unico/gtk-engines-unico-1.0.3_pre20140109-r1.ebuild b/x11-themes/gtk-engines-unico/gtk-engines-unico-1.0.3_pre20140109-r1.ebuild
index f2451ccc2fa1..353b1de94125 100644
--- a/x11-themes/gtk-engines-unico/gtk-engines-unico-1.0.3_pre20140109-r1.ebuild
+++ b/x11-themes/gtk-engines-unico/gtk-engines-unico-1.0.3_pre20140109-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${MY_P}.orig.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="