gentoo resync : 03.11.2021

34 files changed, 1123 insertions, 9 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index bc2c786230b4..bf629f4c1878 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 0d6d3e73d4c5..3eba6c1d915a 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,6 +1,8 @@
 DIST checkpolicy-3.1.tar.gz 69072 BLAKE2B 31cb5ef52533b0a62f954e770278fc5766a961d87fb86260b04abe562bcd90d0025b33931c6ad54096c64ab54150c7562c112eac80eb2f60dbcdda57f4cacfe2 SHA512 2276a5a0919286049d2ceba386ef5f6de523745b588bb81cb4fed5eced5fd0b8070249b7a3ae5a85e2abb9369a86318f727d4073aad14ab75c43750a46069168
 DIST checkpolicy-3.2.tar.gz 69035 BLAKE2B 263c582c8ed3c38822513899f3591edfc5d0132977451503a8b45d2074b5a1c5ce03973353b3ceaad44da913b4e35546cfef1988b68bd517618efdb942f994ec SHA512 133639595c2acc66c02b5a637c5e0c60d80ce2bae04f4a709d9fafabd31f9497d1a6e3334904b985c2a1bd94a7a7e3df782c2af2ae41d1fd79b69156a835edeb
+DIST checkpolicy-3.3.tar.gz 69286 BLAKE2B f22cb1b0dae5a89c0abb500c2f091beda7960493bd0dc3b9cb5bc8d2d08d507870e5db46f53ad87d0ddea5e3bbdb6c721a5c5e6824b37f554049000392af6a6d SHA512 40e7ccd804aa19f229eb76bdaeb79c87ed19004ac7b91674ecfb92d543573dc26f9d456ea25ed1e0ef8e1a69538e41c68b386a0743023f3ea83aa4350fc3ce30
 EBUILD checkpolicy-3.1.ebuild 1149 BLAKE2B beac3751ebcfc7969e662a3cc1b25a266b144db2155a8f469170781d1e6aa515a759d40adecec768e066f6424291e6fd7ed5c3e87f56eb39a309e0e56de45676 SHA512 68682e8384cd6ff456343fdfa611be2bce2e15edb732dc377e8839cd3b1fcf510d914d02c8b2433d34ee6e53fe5cfba46ad0712cdb25f91bff3532b5cf80c035
 EBUILD checkpolicy-3.2.ebuild 1019 BLAKE2B 4ce64afa38737ac28fcaa1f32f8ac017f2077d4cfa4d11d39f8aab684d7e926f37d4923f94b54f3d951674d68bdd1f3395d9a5595987c54531cd5a1c93b28ea3 SHA512 acdc25a5435099b4641e21a1a3d8403b0d7fefb11b1b3e64ac5dc7e1fd2f795308574095774ff8c639de2441a57e1f940a9cb331e8664cf4b7aec0663b1053c8
+EBUILD checkpolicy-3.3.ebuild 1021 BLAKE2B 6abe22c0fc3c4985f29f566335121a42227b70f7704adb1a732f2ed2591ccd35bbea6a81c3ce9b1b866dd87b9a43257153c0ce5d4e2bf34b910f6b9e3acb5bea SHA512 5c875d640ccfcde065e1ea2800a7e8759a4ca0a62f8df0d6b82aa732e80e29ba594c3dbe7b1aa0f7506f44a00b897322e6204e1b8c7d365ac75ac6935cb110a0
 EBUILD checkpolicy-9999.ebuild 1014 BLAKE2B 08372b851c56f8392c54270335c7b4a7aac00f39523f4a1cabbe5a3c1855c3687fb580016589beba2d208f4199a428b72df93a093a1519c3a91a3e01199b0ffc SHA512 fe151a9a059ca7643dc0349dccad1c0eb80cb5c6455b02b85a2aaa747c8e13bdbb3f9cdc3d71313249f8f00ec1b8d5979a253eeea0d0a6b982f77183f798114b
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sys-apps/checkpolicy/checkpolicy-3.3.ebuild b/sys-apps/checkpolicy/checkpolicy-3.3.ebuild
new file mode 100644
index 000000000000..377994434a35
--- /dev/null
+++ b/sys-apps/checkpolicy/checkpolicy-3.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="SELinux policy compiler"
+HOMEPAGE="http://userspace.selinuxproject.org"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug"
+
+DEPEND=">=sys-libs/libsepol-${PV}"
+BDEPEND="sys-devel/flex
+	sys-devel/bison"
+
+RDEPEND=">=sys-libs/libsepol-${PV}"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		YACC="bison -y" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)"
+}
+
+src_install() {
+	default
+
+	if use debug; then
+		dobin "${S}/test/dismod"
+		dobin "${S}/test/dispol"
+	fi
+}
+
+pkg_postinst() {
+	if ! tc-is-cross-compiler; then
+		einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 -d ' '` policy."
+	fi
+}
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 66f945ac7181..2151fa938265 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,4 +1,6 @@
 AUX cpuid-20200203-makefile.patch 1341 BLAKE2B 54d2d82710d88d4f095f712b19488bdc44376aeeeb9395e7d9061ea4f8b33e4a38818937e29dbcf4f48455aca568c3d362b2898fadbfd0ba9b11edfee78878c6 SHA512 ced9f8b91c67b0a9a7aeb7f581cd101a1161810a1de0d876b417e55a56f13c775005f3879c576fed318b2f4809a40db3347dc456d73d9e529d10ff8ab51e1e79
 DIST cpuid-20201006.src.tar.gz 118994 BLAKE2B 05c547858358a92b0c9270066dc33e08693922e4ba765edcba7aca201811c54074a0cd683edb3e9dedf2bb0fd23682b3cc5725e4067b27ec27e0fe979eb22f56 SHA512 f037c1707b49e92f1bd605ec87a0995ae36215d075bcbadfed1d11f5fefda43391b48f10d2517334574aa7e243f0b73d22f1fcbfe1fb133aaf5bad1046e8ba5e
+DIST cpuid-20211031.src.tar.gz 124390 BLAKE2B 69f15a7a6506728a1049be58be43d6b23901e7a2347c4804cbac036fce10b9231df59dc6e49c07b6e66598c4140df8c73f7ecd1567590f30c1b4e79845645715 SHA512 a3d0782980da66e2fb824a907e90f81710a86c8bce110f4f027a4a0146fbecb7005df61dcd070aba3cea8bbd9d58cfb0ae627c7e4d5f3818f305c31600ee65fd
 EBUILD cpuid-20201006-r1.ebuild 597 BLAKE2B 3f7d8c98a6796dcfe78c80365f0d2238f1018cbc85a683ad9a28b3b70f936a99185427b4645073bb2d313821053e7c7d0d2c1c94a00b5330c8d66665690ea648 SHA512 5e3ac12a35b36d088e134b92f652723d8f466287a927cead8162ce321d974f53bb51bf964e9a6f66b42557413eaded47f47d18a6730bd6bb1874155cbd8564f0
+EBUILD cpuid-20211031.ebuild 599 BLAKE2B 8b8ba9702a202768a5371131b67bea23a5cef77329a62e9c5dfe390acc5bd88e152c990982686c6390add7db59aa4c34a4290098e810e268ce12408fdf53ed5b SHA512 ce063b76f6cb0a660d2fa23151399f9a0ac086aaf5024e35576b35ed4eb29afaecf0ec6e4a060e203331cbd5eb0d180fc8370d2db32787d8f55cf3fc778a5449
 MISC metadata.xml 532 BLAKE2B 49d1eb34a9859763d42159adcf9a2dca3128af78aef52cedc4483950084238ba780bd841788f4b27eb72fc44e61c2c5bd264b6c6e2c57824ccf146b6ecad50e9 SHA512 f51db55a3cc5478afba39a42731122db8ac720af8685e093b6952efd2778c9f0668ac936d2a1cdacaf2586d62d0f13240d664a7bd4fbd18236c816e9e6745600
diff --git a/sys-apps/cpuid/cpuid-20211031.ebuild b/sys-apps/cpuid/cpuid-20211031.ebuild
new file mode 100644
index 000000000000..de0e99c961d4
--- /dev/null
+++ b/sys-apps/cpuid/cpuid-20211031.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux tool to dump x86 CPUID information about the CPUs"
+HOMEPAGE="http://www.etallen.com/cpuid.html"
+SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	app-arch/gzip
+	dev-lang/perl
+"
+
+DOCS=( "ChangeLog" "FUTURE" )
+
+PATCHES=( "${FILESDIR}/${PN}-20200203-makefile.patch" )
+
+src_prepare() {
+	default
+
+	tc-export CC
+}
+
+src_install() {
+	emake BUILDROOT="${ED}" install
+
+	einstalldocs
+}
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 551a150fbbc0..916b64b2c93c 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -2,15 +2,18 @@ AUX fwupd-1.5.7-logind_plugin.patch 265 BLAKE2B 7959a4cb059a2207b0048f474ff9e0a3
 AUX fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch 1105 BLAKE2B 898f70b2baa27de6678b415ffe9671e2599ff69d9f1ad52cfcefd271d5c5c936bf32276970ef36a88464f11ea1956d90bedd64989adeb9f87be6a2e4d82bcd14 SHA512 106112dedd1c205604b6588ad08092cdb5bcdc1bab3f2e415526faf7af3075ed442d61b3f31a3d0421b683d6f772fb196f93131d3f2f8227b65a6dc781ec6461
 AUX fwupd-1.6.2-dell-dock-requires-gusb.patch 716 BLAKE2B 470db7243fa0e7398778ef8c5d716013e04ef6429e1b4a35b644c3f4bca7148f3bb9f2fc08814b82edc50e1605dc00feb2691f3f1c09b371afdeb1b838181a6c SHA512 08546194d1dfe27a09b10feb6d63a1f29cae881a0ac23bd1497b91eea44fff21559bb67ab5feac3b5613d4f99626708dade0127cb6c7f5ea4c842612c0323ec3
 AUX fwupd-1.7.0-elanfp-requires-gusb.patch 641 BLAKE2B 54dd8413a9608a9e1711622af3422ad874839c7083009c964f8cb2d198103e551d9bb262fc87da3dec0913829defbff358a2777aed1b11c0a42463d930a6f35b SHA512 fbe76f0db8364dd62b86fffaac16d8cf79eb65cbe71862030641c56d9b779c579f4528d176fbc382f055bee144fed5b2c9823486d3354d7de41240035307eacf
+AUX fwupd-1.7.0-fix-test-configure.patch 508 BLAKE2B 7b06c980fe18ee42969951cef6202c77f8c8bef713a344a6ade039c818e44123c4396ea1c191017d28491a3d3905c552d53d4e7d82d91f4cc4373bfae42861b7 SHA512 23232788c0e80933852d8df816889c8b0b181de62e8b0210f1f3e71f0a6d0ac9a1e484982c29e25bd47f57d49591564e92704afbf2638deb59170c8b65295fee
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78
 DIST fwupd-1.6.2.tar.gz 3885963 BLAKE2B 183abc4d620b884a276dece39ad1e57f606c2237a5fa03b76ede2e1c93bb9548d6641e35490d96e22abbbfb3c1852697a688091f62086f6b2e9d3366e796888e SHA512 a743b37c5969939cc3eb708b0af2e8f6c665848868473c29edf9db110cef5ac62da3c042cfa9617a2f10b2a9d153d0d4146a1832a18bc71fadcbf9a7b5cea1b0
 DIST fwupd-1.6.3.tar.gz 3888812 BLAKE2B 08d24fde80010d50e2396f59d743a00e640c1fcc06f6ada566ebcff48d25f1dc33676a40d13e1b684e45fd9483af1d9755ef3ac00bdaa8a37236589c03bb8a4c SHA512 837bcfe57873315ade8f3ff82d290d492dcb047387db5a642e6e7fc8e9ff7c3cabe5892692e2d4b5b0c5bd69f8a253bc364c61f23013c161a350b39de7d58e67
 DIST fwupd-1.6.4.tar.gz 3891113 BLAKE2B b4f3a629c0594ee69a0e2ea727c8080f63e970a6e9964b53d007e490d6b538f5441a65de20412673ded181611342c7c1c1ec16eb0d05c69c149f635fed325269 SHA512 d0c788313f8cf00c6e0e238436668ab5885133933cd74202d3eb4a3377d1b123689dd7f3827d45853c92b98196d5d896027b471117af461356e2f3c3ec82f58e
 DIST fwupd-1.7.0.tar.gz 4102985 BLAKE2B 9a29621e029c526d513304863294ee69f14ff1cf069b388fe5dc6037b2f030ea24136f18d9096abcc449376295996e3184c1c969f8dda329f2786622ba1300a7 SHA512 148f161f0e8d008fa20091c747baf4a205bc2e76ddc5dbb3676e3f2a15ca5d6d1454b572ea0336f185b5ef3a8ca8bfd3ad1098649e095a58c9822d4dbffe2987
+DIST fwupd-1.7.1.tar.gz 4025627 BLAKE2B 035796e8ebaafe139b8b6e7014f51c6e16a228d0ef697984f86e31c28f38aa62bc7d3bd64466b3f3c83c2605b229d7b3063287373c83ec4d962adca3c85cc6de SHA512 c695b66ebbe23908f5d6ef6d6084c092af8754e0677f094ee4d09b02d904f3f3cca0e460c5345a835c16b7303bba72209e216ba28285e44bce4872fffa136a5e
 EBUILD fwupd-1.5.9-r1.ebuild 4380 BLAKE2B f47d3b9dc882649c85549f3139ea2cd6473c21eee0a1750076b7dfad7c04caa6641f36704bc9bf978e047e16f9a07f12fcc862b22697ae4091c7f5cac31c2256 SHA512 f5d965dc302cd77877f13c0ccc3a952c71a6463b56b5d7aafce11ef4d673e46f9c486159be6e2ccfd1229d42ea014598705b867d7aa7795a5c9e0caf51a76506
 EBUILD fwupd-1.6.2.ebuild 4560 BLAKE2B f85eebae29ee6e20705e7db84bbf8ebc33d109a1fc063c6225c24faf70e1289ae693da3ba6bb36c53ab56e5cfefe39c99a684bbf5393abca8c94b082ce5c9a50 SHA512 f9556caeb5e6678a7bded64b97523e5917a81500a2f7791963c18c769e7e650e3d435c4fd0efe4bb3a0e771d95e294be28bee28a798c974abfaa252de90eb5ea
 EBUILD fwupd-1.6.3.ebuild 4504 BLAKE2B 78cb6e9716c4109fcf2e26cad2c8d5d84d952a1514827f2b48106b8b15d9a65085468396fee88584bc498441ed230dba5b150f682326e982c2fe45620aa3c1ed SHA512 01927eff188e8bf7fa80d394f9666bcc47266bf7e685264da4484ab4c7966adab92669007473c1602b31253cb35ec9bef44737bf4ba78d0ac8b1cb4d9799c255
 EBUILD fwupd-1.6.4-r1.ebuild 4504 BLAKE2B a5efb85ec19fd9484769314b6fcdcdffd1a7d331150496385e1f071421eaa20580c3b7590e52d83e36f752e8953fb6415873cff29fca9a70ea2e66722d4cf105 SHA512 f79dea7b0732564e976507863d39ea2af2d02a4218efc683476f9be1a18248ec8a25f1ff7729a44d5ff0171dc725cac3ebc3057b25c8704365c127a9ac6b9cde
-EBUILD fwupd-1.7.0.ebuild 4672 BLAKE2B 78bbf50d08d5bff520729ba37b774e0760c40d8f2f914f0e958bd06ca76bbf75098fd06eb7620df883069d7b73571edfb4ef0d10d650e760e15036fed67f4fb3 SHA512 7616d9e55c61bc92cea0fd580a79e093c68393d286af493ba92e5a0b6bdfac6d3069a0de936cfdb68f8059ea4ee5418f07de8546e0f67f69c076568eb143a91b
-MISC metadata.xml 1429 BLAKE2B be825264920779449312aca9b1de8aff1811c6d8a2f7e46b184214e41f7658b2af9731172f6950e146bcf9fe175a757b814ea97cab8cbc835c76d57b714f0f15 SHA512 824e5d791e4b631af5b2559cc99f43e19acd6f07e33bb540c1e1bce3ff7eaa336a1c5f325317c79958907a581cab61f53f2465c23927323dcf44dcd179e224c0
+EBUILD fwupd-1.7.0.ebuild 4730 BLAKE2B 2ef6da5175a815e8867b180f0054657be387015ea200979d253bb35e9933adf9a8eee4fc9c64649965cd5fadccd98a3d8180803766abf3c1c586b7e1754c9c97 SHA512 d8c63a463cc5beca4580ab522cd4a027997deb238202e44ce4c1f79634385b834232bf5c4b0b6c20fbaa4e661bd63f78a1f699991eace1f4b3372bfb82dd4a48
+EBUILD fwupd-1.7.1.ebuild 4634 BLAKE2B 25e17477f6fdda731d559f0678558456834f2dd6ea624cce564ea951670dc482bf8fb16b6c8ce03272a4bc127d76f8e3d9fce05a5698a417a3f2f17c7dc70125 SHA512 e7b9940e52bc89a707d2d07107d8de16dd375c9a9ed88d038ac89a478ad36bec6a38378ca699b31c7881ee7c57489dae9d7a440038cf83816d55d2b970f3b1c6
+MISC metadata.xml 1493 BLAKE2B f75354ee9b89d3be913749ffc0d1e8d0d57946f1d785d6cbdab3c6670c790e99666c1943a662d0f5f054e22d3b97e1f8e739640efc5e04659d0a6723ee35b279 SHA512 6ea568ca9c8cba4e0db1f6c06d5e57f539602e5bfa1ce9be2fb9fc7107e1e42dde715c7bd0737ad60246569b0e9fad275a4c451c427451b9692410becb3b05d3
diff --git a/sys-apps/fwupd/files/fwupd-1.7.0-fix-test-configure.patch b/sys-apps/fwupd/files/fwupd-1.7.0-fix-test-configure.patch
new file mode 100644
index 000000000000..4974a82bdf52
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.7.0-fix-test-configure.patch
@@ -0,0 +1,20 @@
+# https://bugs.gentoo.org/791760
+# https://github.com/fwupd/fwupd/pull/3921
+
+diff --git a/plugins/synaptics-rmi/meson.build b/plugins/synaptics-rmi/meson.build
+index acbb6b92..10ac3047 100644
+--- a/plugins/synaptics-rmi/meson.build
++++ b/plugins/synaptics-rmi/meson.build
+@@ -38,7 +38,6 @@ shared_module('fu_plugin_synaptics_rmi',
+     fwupdplugin,
+   ],
+ )
+-endif
+ 
+ if get_option('tests')
+   e = executable(
+@@ -67,3 +66,4 @@ if get_option('tests')
+   )
+   test('synaptics-rmi-self-test', e)
+ endif
++endif
diff --git a/sys-apps/fwupd/fwupd-1.7.0.ebuild b/sys-apps/fwupd/fwupd-1.7.0.ebuild
index 4cf8e1b87b63..aa0388af0054 100644
--- a/sys-apps/fwupd/fwupd-1.7.0.ebuild
+++ b/sys-apps/fwupd/fwupd-1.7.0.ebuild
@@ -91,6 +91,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch
 	"${FILESDIR}"/${P}-elanfp-requires-gusb.patch
+	"${FILESDIR}"/${P}-fix-test-configure.patch # bug 791760
 )
 
 pkg_setup() {
diff --git a/sys-apps/fwupd/fwupd-1.7.1.ebuild b/sys-apps/fwupd/fwupd-1.7.1.ebuild
new file mode 100644
index 000000000000..3d035a100b4e
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.7.1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit linux-info meson python-single-r1 vala xdg
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="agent amt archive bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	^^ ( elogind minimal systemd )
+	dell? ( uefi )
+	fastboot? ( gusb )
+	logitech? ( gusb )
+	minimal? ( !introspection )
+	spi? ( lzma )
+	synaptics? ( gnutls )
+	uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+	man? (
+		app-text/docbook-sgml-utils
+		sys-apps/help2man
+	)
+	test? (
+		thunderbolt? ( dev-util/umockdev )
+		net-libs/gnutls[tools]
+	)
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-arch/gcab-1.0
+	dev-db/sqlite
+	>=dev-libs/glib-2.45.8:2
+	dev-libs/json-glib
+	dev-libs/libgpg-error
+	dev-libs/libgudev:=
+	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
+	>=dev-libs/libxmlb-0.1.13:=[introspection?]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	')
+	>=net-libs/libsoup-2.51.92:2.4[introspection?]
+	net-misc/curl
+	virtual/libelf:0=
+	virtual/udev
+	archive? ( app-arch/libarchive:= )
+	dell? ( >=sys-libs/libsmbios-2.4.0 )
+	elogind? ( >=sys-auth/elogind-211 )
+	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+	gnutls? ( net-libs/gnutls )
+	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
+	logitech? ( dev-libs/protobuf-c:= )
+	lzma? ( app-arch/xz-utils )
+	modemmanager? ( net-misc/modemmanager[qmi] )
+	policykit? ( >=sys-auth/polkit-0.103 )
+	systemd? ( >=sys-apps/systemd-211 )
+	tpm? ( app-crypt/tpm2-tss )
+	uefi? (
+		sys-apps/fwupd-efi
+		sys-boot/efibootmgr
+		sys-fs/udisks
+		sys-libs/efivar
+	)
+"
+# Block sci-chemistry/chemical-mime-data for bug #701900
+RDEPEND="
+	!<sci-chemistry/chemical-mime-data-0.1.94-r4
+	${COMMON_DEPEND}
+	sys-apps/dbus
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	x11-libs/pango[introspection]
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use nvme ; then
+		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
+	fi
+}
+
+src_prepare() {
+	default
+	# c.f. https://github.com/fwupd/fwupd/issues/1414
+	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+		-i plugins/thunderbolt/meson.build || die
+
+	sed -e '/platform-integrity/d' \
+		-i plugins/meson.build || die #753521
+
+	sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
+		-i data/builder/meson.build || die
+
+	vala_src_prepare
+}
+
+src_configure() {
+	local plugins=(
+		$(meson_use amt plugin_amt)
+		$(meson_use dell plugin_dell)
+		$(meson_use fastboot plugin_fastboot)
+		$(meson_use flashrom plugin_flashrom)
+		$(meson_use gusb plugin_altos)
+		$(meson_use logitech plugin_logitech_bulkcontroller)
+		$(meson_use modemmanager plugin_modem_manager)
+		$(meson_use nvme plugin_nvme)
+		$(meson_use spi plugin_intel_spi)
+		$(meson_use synaptics plugin_synaptics_mst)
+		$(meson_use synaptics plugin_synaptics_rmi)
+		$(meson_use thunderbolt plugin_thunderbolt)
+		$(meson_use tpm plugin_tpm)
+		$(meson_use uefi plugin_uefi_capsule)
+		$(meson_use uefi plugin_uefi_capsule_splash)
+		$(meson_use uefi plugin_uefi_pk)
+	)
+	use ppc64 && plugins+=( -Dplugin_msr="false" )
+	use riscv && plugins+=( -Dplugin_msr="false" )
+
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		-Dbuild="$(usex minimal standalone all)"
+		-Dconsolekit="false"
+		-Dcurl="true"
+		-Ddocs="$(usex gtk-doc gtkdoc none)"
+		-Defi_binary="false"
+		-Dsupported_build="true"
+		$(meson_use agent)
+		$(meson_use archive libarchive)
+		$(meson_use bluetooth bluez)
+		$(meson_use elogind)
+		$(meson_use gnutls)
+		$(meson_use gusb)
+		$(meson_use lzma)
+		$(meson_use man)
+		$(meson_use introspection)
+		$(meson_use policykit polkit)
+		$(meson_use systemd)
+		$(meson_use test tests)
+
+		${plugins[@]}
+	)
+	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
+	export CACHE_DIRECTORY="${T}"
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use minimal ; then
+		newinitd "${FILESDIR}"/${PN}-r2 ${PN}
+
+		if ! use systemd ; then
+			# Don't timeout when fwupd is running (#673140)
+			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+				-i "${ED}"/etc/${PN}/daemon.conf || die
+		fi
+	fi
+}
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index d1dfe55c1e5e..09178d3fd158 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -13,7 +13,8 @@
 		<flag name="agent">Enable update notification agent</flag>
 		<flag name="archive">Use <pkg>app-arch/libarchive</pkg> for archives support</flag>
 		<flag name="amt">Build and install Intel AMT plugin</flag>
-		<flag name="dell">Enable Dell-specific support.</flag>
+		<flag name="dell">Enable Dell-specific support</flag>
+		<flag name="fastboot">Build and install fastboot plugin</flag>
 		<flag name="flashrom">Enable flashrom plugin via <pkg>sys-apps/flashrom</pkg></flag>
 		<flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support</flag>
 		<flag name="logitech">Build and install Logitech bulk controller plugin</flag>
diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index 2bc088561c63..b4ec5adef4fc 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -1,5 +1,7 @@
 DIST i2c-tools-4.1.tar.xz 83576 BLAKE2B 0a9ed3bb335b61f6c17a6b6c705502ff008b4fb8bab6a5fde63163a32528b5214d92affc4b8d6cca29676dc7ba82dfa84be5f14943b7e81c8612a7d9419ac628 SHA512 83262bcfd94c2adf74517cc50095dd78221fa4d16a62397245d4a538de7463272abf4f6727024be8ab1ca8ecbfe647af85ba2a553e5b5e68a53e50dfcad20248
 DIST i2c-tools-4.2.tar.xz 87600 BLAKE2B 89f84ad07f4c042f67c308d48a402aa9ed46352062ddad3456d048730019e099e6eef626d487d802e07b100ae2c836e9aa6b2345950ff8744cbc0fe1a22616fb SHA512 5e230be4983c5c9c5718491d3ce9ee2e6205edea75c4097735eb32a25e522e37a074ef4cb61d2492707efebf0cb1b75ff65f1b2ae8c0bc1684a169526809a096
+DIST i2c-tools-4.3.tar.xz 81276 BLAKE2B c7300224c8d32785cd067b632bf0e9591f05264b1572f44aebda5f30a95164732d606710c13739ccb7899476219ceb3033beaf95b718ed7e18122f9181dc13fc SHA512 8a6cc12d927d6291b9baf407bc15807280539a7048ec5c2edf77414432eab43b28353c42bc0e45b7b481502aa4c5588def08f130d97fc275f635d1f77488f501
 EBUILD i2c-tools-4.1-r1.ebuild 1950 BLAKE2B 5c926d1ab2f68669edb32c18afa7f850019fcfd442831b2bfb59c09119a81c6c03102a76eabd5f4a80c6f0998c861960a2a042c4a43d736051d6d8af1963154c SHA512 7dfef8c4f41023505161146cb6a9ec7dfc945d75a76615aab35d4de2f371240be173276d15b4c18f3819e2e0f5998712bb0df2586d819e22baa9852149978f0d
 EBUILD i2c-tools-4.2.ebuild 1723 BLAKE2B 34e6fbb2d6714b3388e57359968c88c2011fe9f486c1b2c68927e331f78aef5459699b6d3056a186321b20c7fbce11c3fde575eca588e647099824e418c39058 SHA512 d24ca25b10db462c3b64f243f97bc50e1823dc1ab042508a4986ffe580a382ddc5e3362f456e5adbaf9c30753f94f0744df14422690860ecc7ba5bbd70d55f14
+EBUILD i2c-tools-4.3.ebuild 1317 BLAKE2B 5b072ff09059804d082081ae8ce638f4d11040d56a1b5ea4920fc96dae8418e2b62f7e5236701367133280b0a0737abd0118d88b63caa854ec181464287d32c0 SHA512 8971bf0d801ad3fb799c15e82a86adf16a8aa21e7c465bde8b4ea025f3df2263f4a630b1a6ea26065854e2bea93bb76ad78868090bf8f31d01198b087454cb5c
 MISC metadata.xml 244 BLAKE2B 94b04f9b5ade506f66b25651b1fdabfaf11febaff3175956406893e90548e87145186ef43a617e24803bd22d9da3f90ea8d72cfea7847aea521974b3138e92ad SHA512 20225e64357a690e86df86aa4d784300459d28b775e3989f77fd31e752ef968de63e41b59bb3c78b331e817f9eceab6dd6ef01131451753a1b5d3a309770611a
diff --git a/sys-apps/i2c-tools/i2c-tools-4.3.ebuild b/sys-apps/i2c-tools/i2c-tools-4.3.ebuild
new file mode 100644
index 000000000000..08557d67f1fa
--- /dev/null
+++ b/sys-apps/i2c-tools/i2c-tools-4.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python{3_8,3_9} )
+DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1 flag-o-matic toolchain-funcs
+
+DESCRIPTION="I2C tools for bus probing, chip dumping, EEPROM decoding, and more"
+HOMEPAGE="https://www.kernel.org/pub/software/utils/i2c-tools"
+SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	use python && distutils-r1_src_configure
+
+	export BUILD_DYNAMIC_LIB=1
+	export USE_STATIC_LIB=0
+	export BUILD_STATIC_LIB=0
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)" EXTRA="eeprog"
+
+	if use python ; then
+		cd py-smbus || die
+		append-cppflags -I../include
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	emake EXTRA="eeprog" DESTDIR="${D}" libdir="/usr/$(get_libdir)" PREFIX="/usr" install
+	dodoc CHANGES README
+
+	if use python ; then
+		cd py-smbus || die
+		docinto py-smbus
+		dodoc README*
+		distutils-r1_src_install
+	fi
+}
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index ea70bb331529..827eeea13e65 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -4,7 +4,9 @@ AUX iproute2-5.12.0-configure-nomagic.patch 6967 BLAKE2B 8707ace3766d2bb79790188
 AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1bfb9d92379983d989d9d4a396e773f02c655ac14c57cc25c5d4e37fbdb0e0d1cb1d35fc94ee70077b81d1285ac2d58cb1b19fa69db SHA512 09a9d450179b06c434a41b7bdd8d4a47b8ca2303de3d08b2b101e8695aec28e5d1e454a8c62e1b71d66b6e776dc6975f2837acc0a0f8a2a3f1e31b1eb56b71e3
 DIST iproute2-5.13.0.tar.xz 845236 BLAKE2B e1c148e2a720236163e7f4d46aa38d244a02ae36ad86571c5606d54c9ccfd8d0363e2fb793d48cf39aae322b3c36b9f8a43eaf570dbdb8243092926cef3d2786 SHA512 a3286639fb303a7c3c553cb5df0a7336c4c67e53eb05e872d2776b771dbfa36ffdf2df140f570275db6785c882992f469f8eb34a5b506aac876216df7dde245d
 DIST iproute2-5.14.0.tar.xz 853572 BLAKE2B 52544021798f2cb716a57998d98dadc2441142b02d38c7e274bc17a6e5f994bdb5bd3ebf0b896bfd7e327a44f00f92c2af8e67367cdc0aac70769d563082f543 SHA512 e2b9b0a2c3e6fc4c67cb50b0a9bf710e749648b83369a49bf905edd7e519d76c50c2cc818bb63cc605c409c66075d4d371f2371796e5f7a8f9d04101b80ef75c
+DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d SHA512 e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22
 EBUILD iproute2-5.13.0-r1.ebuild 4864 BLAKE2B e62ccfe102bad1106e0345e5a986090408c8737ec3b96815250c07d54ef96fc14531d21a2389de46f68d64102a97568096038dadf4c899c0f1ad7f5257381d8e SHA512 681689226fda0bdc8947e2c26420cdad6e971eecb9816a562002fa6e2ce673859ee2b648bb83c9be6bfa3f86033314063b214dc36980ffedf9627ff4f5dfe889
 EBUILD iproute2-5.14.0.ebuild 5002 BLAKE2B 16e104c4b842b0ac1b0492c3d6f332e8d786f40fa258459b49dba84eb3f8fe278850f56b21deae22a81e5229be13353de8df9c824d15fc5adb635b91320f0049 SHA512 eac1d23f28cbfccdaae9e68a2b003bb62463895e4fa9d0dfa3833a0ed88eecad9433929c36e1e30de0de12dbe2a71ea8b86e585d94c6861939bf46aa015bed01
+EBUILD iproute2-5.15.0.ebuild 5002 BLAKE2B 16e104c4b842b0ac1b0492c3d6f332e8d786f40fa258459b49dba84eb3f8fe278850f56b21deae22a81e5229be13353de8df9c824d15fc5adb635b91320f0049 SHA512 eac1d23f28cbfccdaae9e68a2b003bb62463895e4fa9d0dfa3833a0ed88eecad9433929c36e1e30de0de12dbe2a71ea8b86e585d94c6861939bf46aa015bed01
 EBUILD iproute2-9999.ebuild 5002 BLAKE2B 16e104c4b842b0ac1b0492c3d6f332e8d786f40fa258459b49dba84eb3f8fe278850f56b21deae22a81e5229be13353de8df9c824d15fc5adb635b91320f0049 SHA512 eac1d23f28cbfccdaae9e68a2b003bb62463895e4fa9d0dfa3833a0ed88eecad9433929c36e1e30de0de12dbe2a71ea8b86e585d94c6861939bf46aa015bed01
 MISC metadata.xml 814 BLAKE2B a74c3bee84fc81acfeee405c22b84ca9a10f2daf4be9d496202cbc5a2595f7222b864f4105f5dd46ec45e7de57b6ffff991f907da6378293267209b9eafe91d5 SHA512 74936295cae7e84f39ea6dd8e6bee613bed9e9716c6a96aa8f497be96b14367a2d8829db3ed108b760afdd196c5dbc9f32b14f29f5a0939e47b15d7a68aeca4a
diff --git a/sys-apps/iproute2/iproute2-5.15.0.ebuild b/sys-apps/iproute2/iproute2-5.15.0.ebuild
new file mode 100644
index 000000000000..367b3541cbfe
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-5.15.0.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb bpf caps elf +iptables ipv6 libbsd minimal selinux"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+	!net-misc/arpd
+	!minimal? ( net-libs/libmnl:= )
+	atm? ( net-dialup/linux-atm )
+	berkdb? ( sys-libs/db:= )
+	bpf? ( dev-libs/libbpf:= )
+	caps? ( sys-libs/libcap )
+	elf? ( virtual/libelf:= )
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	libbsd? ( dev-libs/libbsd )
+	selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support #549948 and some defines #553876
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
+	app-arch/xz-utils
+	>=sys-devel/bison-2.4
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+	"${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug 643722
+	#"${FILESDIR}"/${PN}-5.1.0-portability.patch
+	"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
+)
+
+doecho() {
+	echo "${@}"
+	"${@}" || die
+}
+
+src_prepare() {
+	if ! use ipv6 ; then
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849
+		)
+	fi
+
+	default
+
+	# Fix version if necessary
+	local versionfile="include/version.h"
+	if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
+		einfo "Fixing version string"
+		sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
+			-i ${versionfile} || die
+	fi
+
+	# echo -n is not POSIX compliant
+	sed 's@echo -n@printf@' -i configure || die
+
+	sed -i \
+		-e '/^CC :\?=/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# build against system headers
+	rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+	if use minimal ; then
+		sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+
+	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
+	local setns
+	pushd "${T}" >/dev/null
+	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+	echo 'int main(){return 0;}' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+	popd >/dev/null
+
+	# run "configure" script first which will create "config.mk"...
+	# Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242)
+	doecho ./configure --libbpf_force $(usex bpf on off)
+
+	# ...now switch on/off requested features via USE flags
+	# this is only useful if the test did not set other things, per bug #643722
+	cat <<-EOF >> config.mk
+	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
+	TC_CONFIG_NO_XT := $(usex iptables n y)
+	# We've locked in recent enough kernel headers #549948
+	TC_CONFIG_IPSET := y
+	HAVE_BERKELEY_DB := $(usex berkdb y n)
+	HAVE_CAP      := $(usex caps y n)
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_ELF      := $(usex elf y n)
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, #144265 #293709
+	IPT_LIB_DIR   := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	HAVE_LIBBSD   := $(usex libbsd y n)
+	EOF
+}
+
+src_compile() {
+	emake V=1 NETNS_RUN_DIR=/run/netns
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}"/$(get_libdir) \
+		SBINDIR="${EPREFIX}"/sbin \
+		CONFDIR="${EPREFIX}"/etc/iproute2 \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		ARPDDIR="${EPREFIX}"/var/lib/arpd \
+		install
+
+	dodir /bin
+	mv "${ED}"/{s,}bin/ip || die #330115
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+	# This local header pulls in a lot of linux headers it
+	# doesn't directly need.  Delete this header that requires
+	# linux-headers-3.8 until that goes stable.  #467716
+	sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
+
+	if use berkdb ; then
+		keepdir /var/lib/arpd
+		# bug 47482, arpd doesn't need to be in /sbin
+		dodir /usr/bin
+		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
+	elif [[ -d "${ED}"/var/lib/arpd ]]; then
+		rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
+	fi
+}
diff --git a/sys-apps/kmscon/Manifest b/sys-apps/kmscon/Manifest
index 7c33cdbb46b7..e7003f01a60b 100644
--- a/sys-apps/kmscon/Manifest
+++ b/sys-apps/kmscon/Manifest
@@ -1,4 +1,4 @@
 DIST kmscon-8_p20180906.tar.gz 1156350 BLAKE2B 52c024ca6e9652b468efb23d38cda34bf0c05e1e2bb4268435e17adb8858439ac6bf0e1783cfdd24a48fcb2dcf7c1cb20eee09aeb90db08c2e94224d01efeff7 SHA512 2ccdc5b30df6d96ac7a75d01d674b295bcdb0d445169716638a20c9884b090bbfe509e0aee79cb674a2d9b0eb18ea6284b9d4e2939cb5bf290cade4c1a02487a
-EBUILD kmscon-8_p20180906-r1.ebuild 2914 BLAKE2B 5ae857b7cc683e7e634b37d4902964d302ade0fc77863b8e2ffda7a61232273dcc8a844d245e8eafa51263358f95c6b31959d9cc524ce51b033d51080565f001 SHA512 e596373113c4f1294fa7cbd6eaee31111ae15eb9332b6f3e1d97d856242ab75020016b214df8e9c19bf59c53f6d931c8635e0cded8faf3790f0133af7c7bf01a
-EBUILD kmscon-8_p20180906-r2.ebuild 2923 BLAKE2B 19a579e503918fca6eb448dd5895690592f683f1aaed5a0c5288766469b3b595a89d84f862ae4527fdae04572d0e359a5c034c56ea637a81faf4005c07135243 SHA512 af719304d99eca7210695deb8410309370c7defba815002c28e9dffefb5d78033f7b02c9eff86d3b7931e78fa0dc99dc8139ac169870a98e946b0ba152cfea0f
+EBUILD kmscon-8_p20180906-r1.ebuild 2920 BLAKE2B 9fa4f3132dbc2c7b9bc65bc023fc45439b6eb699231e0d20ad878d01a27bcd5333cda05a6911a44b7687345278034563a4fe49f7d9f15150ab58e2ee281cdd54 SHA512 ed3061a5f3da10b5b3dee25858bac37ed47ea780ea7e859c82f521c96ea91dfeef99873a1d0a32b5d2d7b03055d3c6e4e972a04a98193bf5a2ada73b6dbe2b1b
+EBUILD kmscon-8_p20180906-r2.ebuild 2929 BLAKE2B 9fa4c899c776e7bd780b6dd40d1a8adc9880ab129a308479f60eabecd00843e389b886dbd632c4d5da4b2d5d04ba655e1af2b49d3bffabd1873b0f523fcb14e2 SHA512 ac8ca2c15773715a2b79b494fd82952f89bd805223a7b36c04a44aa1d81f5378129bde32ef970b1a8c19bcf2af75a44245b880e70dcb2dcad9b9a8ecb4e2f48d
 MISC metadata.xml 665 BLAKE2B 3eda7f9e7848f5e1ee5161d8f124bd9cec1978c3bac41c3d3b90ffa1eb6300cb69a609233307731e7f71c89a30550c61f84d2690793a75f500853491bc137391 SHA512 d692f3f0cdabf80e3c5eb6c4a41efa457ab15b3e90ecadf741e829ea28a63f223e55439b4ca7f0ef15a61e8f9e77c2b9eb0952241940a939e801b97280dbda1a
diff --git a/sys-apps/kmscon/kmscon-8_p20180906-r1.ebuild b/sys-apps/kmscon/kmscon-8_p20180906-r1.ebuild
index ec59e73c6192..4efe46630307 100644
--- a/sys-apps/kmscon/kmscon-8_p20180906-r1.ebuild
+++ b/sys-apps/kmscon/kmscon-8_p20180906-r1.ebuild
@@ -22,7 +22,7 @@ COMMON_DEPEND="
 	>=dev-libs/libtsm-4.0.0:=
 	media-libs/mesa[X(+)]
 	drm? ( x11-libs/libdrm
-		>=media-libs/mesa-8.0.3[egl,gbm] )
+		>=media-libs/mesa-8.0.3[egl(+),gbm(+)] )
 	gles2? ( >=media-libs/mesa-8.0.3[gles2] )
 	systemd? ( sys-apps/systemd )
 	pango? ( x11-libs/pango dev-libs/glib:2 )
diff --git a/sys-apps/kmscon/kmscon-8_p20180906-r2.ebuild b/sys-apps/kmscon/kmscon-8_p20180906-r2.ebuild
index 7e56c83f9f9a..e92402bdb262 100644
--- a/sys-apps/kmscon/kmscon-8_p20180906-r2.ebuild
+++ b/sys-apps/kmscon/kmscon-8_p20180906-r2.ebuild
@@ -22,7 +22,7 @@ COMMON_DEPEND="
 	>=dev-libs/libtsm-4.0.0:=
 	media-libs/mesa[X(+)]
 	drm? ( x11-libs/libdrm
-		>=media-libs/mesa-8.0.3[egl,gbm] )
+		>=media-libs/mesa-8.0.3[egl(+),gbm(+)] )
 	gles2? ( >=media-libs/mesa-8.0.3[gles2] )
 	systemd? ( sys-apps/systemd )
 	pango? ( x11-libs/pango dev-libs/glib:2 )
diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index 83eb23b798fb..413908bc7c94 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -1,7 +1,9 @@
 AUX mcstransd.init 656 BLAKE2B 782add77ee81b582151c35003c303b5e67b4ffc4e6f4af97ec51f20541863111de4298b7d6eb0911ded757cadc1ba4deefd500d8a6e335693191e2e65286a585 SHA512 8de0df316d8c926bd99515b4c6eb5bc9d51df3925d3dbad49fe0229193e82f008b09a7343c0d1c2cdc9dd35ad8fd7c82e29ba2bd6a7ab6cf882afe78985e9579
 DIST mcstrans-3.1.tar.gz 44598 BLAKE2B 1755c2f56e3d40fa2ea95c349988fe5dd7b52a9f26bef0f42e42bda8f7b94993b9a47d2e333337f746cbabd9dd571118b0a8e1ffb7c22c604db58fc809bcc033 SHA512 21e9b7a8c9d98cbee61f2eb1c440a51d19ac111a5955c24d365a8784e1aa34fb47a22a108e550c8a4cde4f25ec5afc466126a68e9faedfc796bef83eada93b60
 DIST mcstrans-3.2.tar.gz 44596 BLAKE2B 6738acbcb7c25ec67b8d14cd166c601c7790d28332de8eb4caec32e43390b199aeea51750856aee7c4a2bcfc003af3ac01b00a4247578230d42de3956a88ebb2 SHA512 edc7d4c255056d823c67d69d0c0bb49e8da8cf1b69d94b65e1c2cb5f4944dcc0bd26ed795d76cbe310d9c98b98ca69a49eb7e39ed4cd7df3f6ed8bd1b68da6b1
+DIST mcstrans-3.3.tar.gz 44621 BLAKE2B 624780c219d0b8f369def5ab334caf9d2ae847f9cfb4359ce38e240bcb72b7cfeef45d08cd6e7330cc90394f6c32bd622d2133e675036f98992145b1530ab1e2 SHA512 2157a0361bb5a2bc8e149373b2dd7d9b042f8c4c0aa845ae6967a23d9b875d2dcd6176d99d7f8f15e17eb5877fea60814e19aabfe76950d25b75c9c25df811c2
 EBUILD mcstrans-3.1.ebuild 1076 BLAKE2B 95420d079ff83b4a3e4aa7655932d1ded963f53e01e4cefad6b49613f882458c3ac9ec4a9f0771f314e32d341cad58e5684aa56b669e191b0a353c217c2a3a2c SHA512 4c41ad6cb454f39743f3d822298743abb5cba0846a030e2666e7beae9fb245ec8acc60b32762c1ce66131f188cb0dfbe69f1fc933dabcc62d8ae9d2dc5884e78
 EBUILD mcstrans-3.2.ebuild 990 BLAKE2B 5727f7797e09a3d4fd2783fb0386389b9c5d4cb436f3d920ada8d94bc45a4f2645787d7564f95abe39128ddd31763fa67584b2d66156c8eb41525f78d082c8c0 SHA512 c4a5958839c8aab262a8424b2228fa7b503a6cd1d39986de47cad689b241a279f05c7db7551632e767090d8ab36fc065b8400d7ef6a22047d93039a59bc77abf
+EBUILD mcstrans-3.3.ebuild 992 BLAKE2B e334940d81f7b75e79fc4556cc4e578dab2479bb54bb0b72452fde69808097df9e45106e864459363fef8db1d9e17f0539295d7c52c27758a199cf1bdec4224f SHA512 1ab31b01289d8b89fa6a7ab877c2f86971855b9edf26b623b3b213f1c501f1e070388bc2cc6f90308e7fdc146220e65b8fa4d525f8e7c69439d25f892dbb51ed
 EBUILD mcstrans-9999.ebuild 992 BLAKE2B e334940d81f7b75e79fc4556cc4e578dab2479bb54bb0b72452fde69808097df9e45106e864459363fef8db1d9e17f0539295d7c52c27758a199cf1bdec4224f SHA512 1ab31b01289d8b89fa6a7ab877c2f86971855b9edf26b623b3b213f1c501f1e070388bc2cc6f90308e7fdc146220e65b8fa4d525f8e7c69439d25f892dbb51ed
 MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664
diff --git a/sys-apps/mcstrans/mcstrans-3.3.ebuild b/sys-apps/mcstrans/mcstrans-3.3.ebuild
new file mode 100644
index 000000000000..631d654a0a38
--- /dev/null
+++ b/sys-apps/mcstrans/mcstrans-3.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+IUSE=""
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DESCRIPTION="SELinux context translation to human readable names"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}:=
+	>=sys-libs/libselinux-${PV}:=
+	dev-libs/libpcre:=
+	>=sys-libs/libcap-1.10-r10:="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -rf "${D}/etc/rc.d" || die
+
+	newinitd "${FILESDIR}/mcstransd.init" mcstransd
+}
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index ac1aada4907f..8d97b519c985 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -4,6 +4,6 @@ AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6
 DIST openrc-0.43.5.tar.gz 242146 BLAKE2B 993d3895588e8f1383049006834f944faaae0f889d3afcae5bff697db9f26383712f18aba52ce07d835f1d2bbe8ef19ef116ad60141d1eb0650767430d1d9967 SHA512 680c1549a8a37eb3a719f3e026888d045d26c98357d6e6eaf09069a23a001272deaca8cac4a9b8fd79f489c4cfb4fe2c7b5d481d1469798a8f5ec470d0cadbe3
 DIST openrc-0.44.7.tar.gz 255444 BLAKE2B 8058e1fd8fcce46f53e73b56ec8da5eec9ba0807d657aef4ece2d49056c02a451c41155df96b167ff157863a85d77eb63796715b5191dd1c6c631c8f859d3090 SHA512 c6b3e2e30615d97a5185320a140ced881bc59ba31ea8dff5d80440396166af237826de6ffc7836ec141e305c92176cd9cc3dabff7e42ac0d80e5238513fefdb7
 EBUILD openrc-0.43.5-r1.ebuild 5066 BLAKE2B b3e56275bd07558fa1b3a67e76c343d4368803ff8c806872e1fe7351667848640b722de86c5cac410d76e02d69a5adb764a942aafa180e22c4d79d7c90533e6e SHA512 8214a366eeb208c3f05302ec0f35a0bc9fb500951d102faa3010c0b8dc005d2d4a04609efd89351c76984ed18b0013e16367a0d257d809b667f69f981164dd46
-EBUILD openrc-0.44.7.ebuild 4534 BLAKE2B c9e833d7b41f15e76dc1877493f06567d22bfcab7f9e62abaa30b8540b1d2d46fa83098259368ffd3ab2b93881f973d4335128c1ed70b937d465ec611c0e27db SHA512 0cc39723a7bf28ef6bcdda6893ac8ce1f3c06050f6754afeb81832635d56525c28d0af4d479b8d3199792e084165f515b32eab3747cb64a635cc552087550fb5
+EBUILD openrc-0.44.7.ebuild 4527 BLAKE2B 8f583afc9ed0130d99193ab7dfbf2b74fd38aff8fa227f1ac5544cb156b4c0a0334945d25fcd675cd7ba8cc8876c7a1211dec001aa69dfda570ef9d104ac1e90 SHA512 b908e64fdc78bd79a5651b375b0beb43e30e29399425286d39eb34c9e96a0a3def8259d3939d4d97545180b27fa68aa9c7b765ac793c04c449818527b632fa18
 EBUILD openrc-9999.ebuild 4535 BLAKE2B 7320f6dc00ac1df21449846c389bc6cba8797da82bebb2b2055eb83e79351e593a0a9137222dca1f02de05ca6e1fe86f05531c51793aff2f0ee3376bc35ef91d SHA512 e59d13f838fbf466855c6049f8d743c952aa22cb97f1c617aff167db36069fc1e5c6aac283aa4920c33ca95ec2f0ec3598b1501c5aaf06cb8bbec69d8129031f
 MISC metadata.xml 707 BLAKE2B 713b69a4e4d6a61051c9f6dfda46da3afa62c590c62b4f371f3949140eaecfa665a977091ac858bff99380dfc3758038ee6a96b0c8b88c142e2e751b20318fba SHA512 5260e1aec8973d42bf059b1f20b3a5f95b98608efeac614d46b20d774a3453c25348cea4a45d745abe829ad016dbc524080c482c1666032e969e08fefe1efc37
diff --git a/sys-apps/openrc/openrc-0.44.7.ebuild b/sys-apps/openrc/openrc-0.44.7.ebuild
index 8edadaf9e4e1..5146d1891fb4 100644
--- a/sys-apps/openrc/openrc-0.44.7.ebuild
+++ b/sys-apps/openrc/openrc-0.44.7.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} =~ ^9{4,}$ ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-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"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 759f7afc6650..ececbf3b75b4 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,8 +1,10 @@
 AUX policycoreutils-3.1-0001-newrole-not-suid.patch 212 BLAKE2B 0d3efdc32cb29b122b16e88190cad74891434c57fff3d9d4fa2529ac5e88cbbf572e710cf0bc313ffb83d8e80261265c121230f3975900a7ed97093dbd2f8930 SHA512 2e42dcc62be3a224b0bb153c615e12dc7febcb11bc46dca32d1ccafe51a8ceb4e57c63080b6cd8c8e87e16ea901dcfdc6aab9dd9c6f48b691a23da4eadad007d
 DIST policycoreutils-3.1.tar.gz 2817914 BLAKE2B ef68bb5f9cf577164ead44803b6be2bd6401c9e923d2c775c7c8c47f0e803749feaec4247fec5cc1cb766314954402fd2506370bb397f746437ecfcf65b384f3 SHA512 0592f218563a99ba95d2cfd07fdc3761b61c1cc3c01a17ab89ad840169e1a7d4083521d5cacc72d1b76911d516bf592db7a3f90d9ef0cc11ceed007e4580e140
 DIST policycoreutils-3.2.tar.gz 2817961 BLAKE2B 747cbd7b84ffa9153067340f8f1dc5a652eaf85b037a6e10e116d3d0b31c8e7c9794bc6a46ae212848bef4887478ac167e359a387bebac49e0acd08b727808ce SHA512 d16781d2d61b8b78d6fc242f2b5c3a03f47ea524fb61655823b6b0f0327ff376c65fe7bdf7a53f5863c01e599cf4a7050f21fda0fe6a8f2c2c16f89b156a4346
+DIST policycoreutils-3.3.tar.gz 2818092 BLAKE2B 0ed9f128a774176ebadb71f448af8dee8c616a706314783b646869e7ea91892e358d5bb03e3aece3d0e6dc3203852e4e2925482727df1e5c71e075236ee43e5c SHA512 db658990355f99a8e43f53d20cc67bf9e557b0a7837d1927c80f325b7f93ad47876382278a980b818484d6e31712a9b03e279f947ebc88c4be60a9f395607f98
 DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f
 EBUILD policycoreutils-3.1-r2.ebuild 4624 BLAKE2B b467137228cf544f8467a109eb2a00fa80a8b1ddedeb13a60faf2dd0c9adf5c5b622ca045874c691cedc5429614c1d7c73dd385f8faad5ce1a95016c12790be6 SHA512 51e326cdb0f0103b40fee5826e8608e66d90b4ebf40b6313092f341f2438b49892813ef24d1bd60e00bd9102a31120db326ad47359c02fc7792d7fa9f755e32a
 EBUILD policycoreutils-3.2.ebuild 4479 BLAKE2B b2c21302b74e1c13f6bd842b91a72b4ff0a212597c5ab84e56123185db33e04b9d60cb11bc952ffeb72df6f8e2d3eb8190b7896c45cc3364b274a1e8db06321a SHA512 93866105e6c6145648c6c72c20fbd4e246836887275f13e22b8794bda7fc3dbbf93edf493acec5cd157dfe6e9f9d3bafc40e97a03084e22ae01f75bb21151aba
+EBUILD policycoreutils-3.3.ebuild 4481 BLAKE2B 58bb10ff43da7cfdf706cd201e19abe70992d1fb49172f20aba80f7cda1bce21de7b7bbbd342c3586b4f18cea6b0d1505d4def30477abba257f78fad6c54c9f0 SHA512 73808abce9ab0c4f9b4714945cd98ab70a1bb37b14fc4326fd8e0ba001db1152af45f0fa315bab57a357aaf80a111d8f517ae6bc87ab4a7de449fe25624f9e78
 EBUILD policycoreutils-9999.ebuild 4481 BLAKE2B 58bb10ff43da7cfdf706cd201e19abe70992d1fb49172f20aba80f7cda1bce21de7b7bbbd342c3586b4f18cea6b0d1505d4def30477abba257f78fad6c54c9f0 SHA512 73808abce9ab0c4f9b4714945cd98ab70a1bb37b14fc4326fd8e0ba001db1152af45f0fa315bab57a357aaf80a111d8f517ae6bc87ab4a7de449fe25624f9e78
 MISC metadata.xml 1118 BLAKE2B b77b6c2e9fbc2fe7e0079d08c6e361f91131951db7f3babd217b6a122f780cdb1cf7624ab3af21066d65493b571516da7ba2f2dcb41fe6d1dadef4ffb12852fb SHA512 a1cce588f3d89b33399bc871da491480610c187379d62a4650c02955ff213b93f506a4d82e638a5ffc5ca3a2f4210b89c078406cc0d835d2603676e600b9d8de
diff --git a/sys-apps/policycoreutils/policycoreutils-3.3.ebuild b/sys-apps/policycoreutils/policycoreutils-3.3.ebuild
new file mode 100644
index 000000000000..c8fe18af66f9
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-3.3.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_REQ_USE="xml"
+
+inherit multilib python-r1 toolchain-funcs bash-completion-r1
+
+EXTRAS_VER="1.37"
+
+IUSE="audit pam split-usr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+	S1="${WORKDIR}/${PN}"
+	S2="${WORKDIR}/policycoreutils-extra"
+	S="${S1}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz
+		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S1="${WORKDIR}/${P}"
+	S2="${WORKDIR}/policycoreutils-extra"
+	S="${S1}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libselinux-${PV}:=[python,${PYTHON_USEDEP}]
+	>=sys-libs/libsemanage-${PV}:=[python(+),${PYTHON_USEDEP}]
+	>=sys-libs/libsepol-${PV}:=
+	sys-libs/libcap-ng:=
+	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
+	audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
+	pam? ( sys-libs/pam:= )
+	${PYTHON_DEPS}"
+
+# Avoid dependency loop in the cross-compile case, bug #755173
+# (Still exists in native)
+BDEPEND="sys-devel/gettext"
+
+# pax-utils for scanelf used by rlpkg
+RDEPEND="${DEPEND}
+	app-misc/pax-utils"
+
+PDEPEND="sys-apps/semodule-utils
+	sys-apps/selinux-python"
+
+src_unpack() {
+	# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
+	default
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	S="${S1}"
+	cd "${S}" || die "Failed to switch to ${S}"
+	if [[ ${PV} != 9999 ]] ; then
+		# If needed for live ebuilds please use /etc/portage/patches
+		eapply "${FILESDIR}/policycoreutils-3.1-0001-newrole-not-suid.patch"
+	fi
+
+	# rlpkg is more useful than fixfiles
+	sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 1 failed"
+	sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 2 failed"
+
+	eapply_user
+
+	sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror"
+
+	python_copy_sources
+	# Our extra code is outside the regular directory, so set it to the extra
+	# directory. We really should optimize this as it is ugly, but the extra
+	# code is needed for Gentoo at the same time that policycoreutils is present
+	# (so we cannot use an additional package for now).
+	S="${S2}"
+	python_copy_sources
+}
+
+src_compile() {
+	building() {
+		emake -C "${BUILD_DIR}" \
+			AUDIT_LOG_PRIVS="y" \
+			AUDITH="$(usex audit y n)" \
+			PAMH="$(usex pam y n)" \
+			SESANDBOX="n" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)"
+	}
+	S="${S1}" # Regular policycoreutils
+	python_foreach_impl building
+	S="${S2}" # Extra set
+	python_foreach_impl building
+}
+
+src_install() {
+	# Python scripts are present in many places. There are no extension modules.
+	installation-policycoreutils() {
+		einfo "Installing policycoreutils"
+		emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+			AUDIT_LOG_PRIVS="y" \
+			AUDITH="$(usex audit y n)" \
+			PAMH="$(usex pam y n)" \
+			SESANDBOX="n" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)" \
+			install
+		python_optimize
+	}
+
+	installation-extras() {
+		einfo "Installing policycoreutils-extra"
+		emake -C "${BUILD_DIR}" \
+			DESTDIR="${D}" \
+			install
+		python_optimize
+	}
+
+	S="${S1}" # policycoreutils
+	python_foreach_impl installation-policycoreutils
+	S="${S2}" # extras
+	python_foreach_impl installation-extras
+	S="${S1}" # back for later
+
+	# remove redhat-style init script
+	rm -fR "${D}/etc/rc.d" || die
+
+	# compatibility symlinks
+	use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles
+
+	bashcomp_alias setsebool getsebool
+
+	# location for policy definitions
+	dodir /var/lib/selinux
+	keepdir /var/lib/selinux
+
+	# Set version-specific scripts
+	for pyscript in rlpkg; do
+	  python_replicate_script "${ED}/usr/sbin/${pyscript}"
+	done
+}
+
+pkg_postinst() {
+	for POLICY_TYPE in ${POLICY_TYPES} ; do
+		# There have been some changes to the policy store, rebuilding now.
+		# https://marc.info/?l=selinux&m=143757277819717&w=2
+		einfo "Rebuilding store ${POLICY_TYPE} (without re-loading)."
+		semodule -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
+	done
+}
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index 4774cc4786fe..6b836fe23de4 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -1,7 +1,9 @@
 AUX restorecond.init 647 BLAKE2B e716293dee6f66a43d95cf43b6e4a50392d66d3d1fb2f082c9c9c9ef458ef87c48bf2e6cacc8c2603a51d9c639938056cffb49a0b089eb4b2a088a11af8eec0c SHA512 dd68ba095d67ccc6f698a8ab2d86942458763619d97a68f421eff0a48d72e66021df40121440107b9402a30a4e4351526d0878dca29a7eb57d68399052b1e2a6
 DIST restorecond-3.1.tar.gz 18939 BLAKE2B 3a3fcde057dad3ed05692d679ba27e0b24f191d92ed5114fa38cb5f846c4cc00d85bb09b5d4e560ed2b914444e0c2d1c407f6c03900610624d5626d05f2991bc SHA512 cdcf299f48b89a7c641ded9507b9b966bf648497394f8e988a9cb1ceb3224c86369706027f3416a4f9750836f7a8f4580a4b3df76673e03f897b383d7ed0e2c8
 DIST restorecond-3.2.tar.gz 18965 BLAKE2B 6cbd32c7c33fcc9f3fff78cc1faaa354c7ee918bfde8e12dfa73ce99632a8bc1e00d2f3b7cdd9c72179dbb51af1847e8dadd41cdc3ca20e9fb45e61871325029 SHA512 b1437a5d4dffef3463a0f2994f07c98585e9cfbc354db2dc07483fd9b964b079090697a277d2f4fd6bcd8df62f7505962fdca22d700721f6ba71490ace0167a9
+DIST restorecond-3.3.tar.gz 18970 BLAKE2B 41c0eed734ab1e89cdfd40fdb0ceff47e1c4bb66354ff78d548a9747c661fbf7ed4b6b3daa1e39325de2a2ca087aca803f073f942f3ac89b71d873e27a1d6712 SHA512 ea2b97d22c1d68aa4ea31d8850f8c9632c0db0d4d666e323c648da896554c6a6fdf6dfa3c105a1df3f1ede9da8cce5ba4c1533b05520846fcb2d584935e5d7cb
 EBUILD restorecond-3.1.ebuild 1170 BLAKE2B 98e3caa2596762f7a123252aebff2b9d2fd774e070fcbbd5bfcf13445b1ee1afe9e6850fcf37491cc6da6d382c0a6af360902180dc17905384eb78840dae1055 SHA512 68d65a4b44f6d1b5cd20226a25e8813af4cee19bb2d197ad188c79fa4cf3f152307c2cfd0ef4198f9684ada8efddcb243db97ec13b9dc5843d4fb4859938c91c
 EBUILD restorecond-3.2.ebuild 1084 BLAKE2B e60456cdcffb87d4cf6fa9f3595d906ffd1b9663c29b5228e779ae1506e4cd02875c57c6452a1a21227e13cc78dde855d35d18aa89b737268b7d8e73340093ac SHA512 4481e3167024db0ad648b815ad770f8a4e47183a33c9b5139cee967f640fc575cd0da0fc0ca485441de2be7f688ed6c034e152a6293606db13ac63b8223c261a
+EBUILD restorecond-3.3.ebuild 1086 BLAKE2B 5e96801f2054d6b2a825f9ab4d63f39f91597488a31dc76ce1111de3b1e3e357897dda4b6ff9ad09fa82dd180bd64770397c06a938bd5999896b38266389fd3d SHA512 a0108d23bfb7dc4990eb4d25e7ab53136454d9250e4849814602d394e31329fe7f7c6c94e07af3793bc689a4655d2c0442f1f70295750643c6948eaa4a8c5118
 EBUILD restorecond-9999.ebuild 1086 BLAKE2B 5e96801f2054d6b2a825f9ab4d63f39f91597488a31dc76ce1111de3b1e3e357897dda4b6ff9ad09fa82dd180bd64770397c06a938bd5999896b38266389fd3d SHA512 a0108d23bfb7dc4990eb4d25e7ab53136454d9250e4849814602d394e31329fe7f7c6c94e07af3793bc689a4655d2c0442f1f70295750643c6948eaa4a8c5118
 MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664
diff --git a/sys-apps/restorecond/restorecond-3.3.ebuild b/sys-apps/restorecond/restorecond-3.3.ebuild
new file mode 100644
index 000000000000..f3e66897e8c1
--- /dev/null
+++ b/sys-apps/restorecond/restorecond-3.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit systemd toolchain-funcs
+
+IUSE=""
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="dev-libs/glib:2
+	>=sys-libs/libsepol-${PV}:=
+	>=sys-libs/libselinux-${PV}:="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \
+		SYSTEMDUSERUNITDIR=$(systemd_get_userunitdir) \
+		emake DESTDIR="${D}" install
+
+	rm -rf "${D}/etc/rc.d" || die
+
+	newinitd "${FILESDIR}/restorecond.init" restorecond
+}
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 8a4aa14bd1f1..425dd460fdfa 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -4,9 +4,13 @@ DIST sandbox-2.25.tar.xz 436004 BLAKE2B c9c7d351cdefbb2b1a585904c38742a5a3bde50d
 DIST sandbox-2.26.tar.xz 444412 BLAKE2B 3bc88d86ba4e2522895c4448dff6da2cffceb912e5ff9610fe4c3aea255ffd9b9ca9bbe8e45d94508f45e9c141aa6945a9a8d82cba0f3ca102ff6a1624c84161 SHA512 f20766daf2ce43753772a184c86a7b6847f96ab7b60b202616e15d791bc1f770162035a9b1ffe38765dff8d2567ad971a9a2bdeba9a8769845a758fcd95206fa
 DIST sandbox-2.27.tar.xz 448948 BLAKE2B 03a311c8c7c8719bac398e39ce49e7149bdaa1d5b2811f395eb2251a32aabba995f97c3d5d27461aadb64bf43adf2b0cbaa7c2f141dd86f64f8dd326422ac104 SHA512 2a53e6fc87cec975962737b1fadc447d86985d27b18ad2caed711116da2ba435f54db0f7dadb02664b2638b9dc77752831cd4820390f5c3e61a42429e13462a7
 DIST sandbox-2.28.tar.xz 450840 BLAKE2B 1a144db1dcd140ce393f47b224c4389693bd3db6d056749968a9e78730b1075192148aa63fdfd5ab93893dfb96a87bcc36bee8b4540abefca0590a8def8365f2 SHA512 eaac54fbc35f51da3c94bfa10e0556f0fd39c20660fea2aa7d3cbf76dd3e4c9fb4a16cc198425988b79313f9331af030e1dca431c3f057ee4a04927c96897895
+DIST sandbox-2.29.tar.xz 452784 BLAKE2B 388f5d9c49134696bafbc6b882581396a9fa2e7caa6ccfb4376706d653f836ce18e0d77527c4c4f2ff753c0b920ab5ab60e151dd8a4e399e13dbc3fe7c0533d6 SHA512 15c0e6b71e8b8547b8188f857568c99b1925d5a837a289b21c4f842341361bf7119b96083697dc83546caf530daab700fb8c2704974e7cfb804d64bb5257a4b4
+DIST sandbox-3.0.tar.xz 454384 BLAKE2B b4f38b7c5ed2dc52e558f1b7e36d2308e6017c9d14861c60eace0f240a909f11184e259b2359ea96cad81d21234cc9a6bcd9f313ce56bd2f3bb1ce836f006a50 SHA512 3a35ee0b19a356b1986468ef5d2ecd553b88cbdaf287ce31a211b4072097a9844fca413ffa0f2858b9a4e75ead822fe9d9834f17c241ba32c2f14e02619a70b3
 EBUILD sandbox-2.24.ebuild 1617 BLAKE2B 5bb22638ea5e5735242e538cb8e0e2598a38237001162fa0cd4d4c3dba6ddb7b9d4607b04ab20b00cb2e7b17c7a759808117d6c0c521a7ba6843fb42e29d1ab2 SHA512 845b5ae83d2c12dc7101d01b76af6693ae888237eda43d2207ef4a1fd3c121d79c554cbb1e7395365867cb96b6a27bbae1c26ff79c301ed00e536acef396dae9
 EBUILD sandbox-2.25.ebuild 1615 BLAKE2B b42f819adc73df7f3c7b0f2654eeaa41f23840763c3fe5abe64ba147b20cf74f1df7411a1309d2581b4264a9a5152eda6386551acadfc04125d31251557c10b6 SHA512 df4789dff85f482c7e9750d8581d2b74686bef82a5b4dd15d1a4b7923f7a2541f68afa5e5b5c091ccdab8234eba2708110401bad527c99e25e236dd8921e8abd
 EBUILD sandbox-2.26.ebuild 1455 BLAKE2B d1d05a952f34ec697b26176ba6183006d636d546af197277d30a1811b7200a45d1327db669ac411174e74989024f4c87d69ffbd68834e7a76fdf5a8ce8bd0446 SHA512 8fb95b39aad62153208436bb73c84fd6d891333cb251958ac2ee71913cdc59b98002f53dbb471fbbb2e76ae954b34c3cedc8c94b4f5d6e4fb65ffd40e4c8b3d7
 EBUILD sandbox-2.27.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca
 EBUILD sandbox-2.28.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca
+EBUILD sandbox-2.29.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca
+EBUILD sandbox-3.0.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca
 MISC metadata.xml 377 BLAKE2B fcbc91501a4a61bfa3c3cc01b0746f5f638093933cf8a9ba1e6206071cb0482c9ba18c5c10541d934327cf805ee0e40c010b3f25a221ab63fefa2fd9f39da0d7 SHA512 92aa26a3200dd1508fb86da0e0bc70be66ccbcf66593ee6833102c9961ac17c8a99c5b070a2cd2e79dba8e5daa0316cdb6744baa3fbd9342953fcc00b1277d35
diff --git a/sys-apps/sandbox/sandbox-2.29.ebuild b/sys-apps/sandbox/sandbox-2.29.ebuild
new file mode 100644
index 000000000000..83e908988817
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-2.29.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic multilib-minimal multiprocessing
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
+SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+nnp"
+
+DEPEND="app-arch/xz-utils
+	>=app-misc/pax-utils-0.1.19" #265376
+RDEPEND=""
+
+has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" sandbox_death_notice"
+
+sandbox_death_notice() {
+	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
+}
+
+src_prepare() {
+	default
+
+	if ! use nnp ; then
+		sed -i 's:PR_SET_NO_NEW_PRIVS:___disable_nnp_hack:' src/sandbox.c || die
+	fi
+
+	# sandbox uses `__asm__ (".symver "...` which does
+	# not play well with gcc's LTO: https://gcc.gnu.org/PR48200
+	append-flags -fno-lto
+	append-ldflags -fno-lto
+}
+
+multilib_src_configure() {
+	filter-lfs-flags #90228
+
+	ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_test() {
+	# Default sandbox build will run with --jobs set to # cpus.
+	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
+}
+
+multilib_src_install_all() {
+	doenvd "${FILESDIR}"/09sandbox
+
+	dodoc AUTHORS ChangeLog* README.md
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"/var/log/sandbox
+	chown root:portage "${EROOT}"/var/log/sandbox
+	chmod 0770 "${EROOT}"/var/log/sandbox
+}
diff --git a/sys-apps/sandbox/sandbox-3.0.ebuild b/sys-apps/sandbox/sandbox-3.0.ebuild
new file mode 100644
index 000000000000..83e908988817
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-3.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic multilib-minimal multiprocessing
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
+SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+nnp"
+
+DEPEND="app-arch/xz-utils
+	>=app-misc/pax-utils-0.1.19" #265376
+RDEPEND=""
+
+has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" sandbox_death_notice"
+
+sandbox_death_notice() {
+	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
+}
+
+src_prepare() {
+	default
+
+	if ! use nnp ; then
+		sed -i 's:PR_SET_NO_NEW_PRIVS:___disable_nnp_hack:' src/sandbox.c || die
+	fi
+
+	# sandbox uses `__asm__ (".symver "...` which does
+	# not play well with gcc's LTO: https://gcc.gnu.org/PR48200
+	append-flags -fno-lto
+	append-ldflags -fno-lto
+}
+
+multilib_src_configure() {
+	filter-lfs-flags #90228
+
+	ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_test() {
+	# Default sandbox build will run with --jobs set to # cpus.
+	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
+}
+
+multilib_src_install_all() {
+	doenvd "${FILESDIR}"/09sandbox
+
+	dodoc AUTHORS ChangeLog* README.md
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"/var/log/sandbox
+	chown root:portage "${EROOT}"/var/log/sandbox
+	chmod 0770 "${EROOT}"/var/log/sandbox
+}
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index b2476b242df1..fc55488eca51 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -1,6 +1,8 @@
 DIST secilc-3.1.tar.gz 176631 BLAKE2B e79818580d2a788d672574ebd77349f0c59b678d2be628479f517412ca876fa225ba0dd63ef3200ed15ff693cd5f4cb4ff537d81666fef3a008ba4b3a7577e0c SHA512 79e3e4910178af49ea164d620aa997adb21dd18581c054a4023dd9116ec9dd203bd12989ef308aa1d253b47fcd251ee2b99c26e143d1db3de22a7f374ff38e0b
 DIST secilc-3.2.tar.gz 179384 BLAKE2B 89a02ceeaeb221eb5e819f6c6f09cd7e4675971d1870850867f0e258e3cf089c048a2976016c8200cffcb7904aae01d7e9d6a0c086a2a33fb08020df10b92059 SHA512 ef60aaaba3a9b4d8da496ae80203a8c9595dc2f97f767432f6b3323395fda65293540ed9574e8d7d3f40854c3ad38a95a7b96939b6c689f02a3d04834b81ca45
+DIST secilc-3.3.tar.gz 181205 BLAKE2B ffccf2e6ea416f6e5a8270a488c6c6ed01b607af20fffed129f5d9b9957f2ab16e90a3fdbd57b597f1195987edf6a2ca1ae561cca62d176a01878fe24900f4b9 SHA512 11b2b6a56d588a71d8cc5b2e69e76579ddd3ea20e036bbfdbeefd8ed64a6dca3c8f963509a96231eb21807a195ec24e4807ef52dc2218ee0410ee0828ad77fa8
 EBUILD secilc-3.1.ebuild 877 BLAKE2B ec8b1f7e9874e234d561ac9deb26b128ded5599616bd2e501b6fb591e77c45942466c227103c7f040dd10ba49445e283e9fb410d3f18635c8f4eb9d0f0571b8e SHA512 e3d0bd0d5bcb480d10f7a7e188a13b380f6452a5f153a0c5abe3b58bd475225d271e127cb1ec6c9ea98e3405095992aa88cfceceaae7278281cc8ce0bded1904
 EBUILD secilc-3.2.ebuild 772 BLAKE2B 49c4cdaea7d58b8d3f7b5c3a392e12f3cb56534905cfb54a379f142667805d27ee7003c8a3cfc778a74887cd91d5ef4df5903b803be79389c559fe9f9371854d SHA512 1867606221210d55944a10ed38bf2a349ff0472e0e77c7091a823f2989ba811cd7df984c3457721f01dd63e66758789c73fb5b0fb4ba1aab300d881dd90eaaff
+EBUILD secilc-3.3.ebuild 774 BLAKE2B d709fc9df54be7141f47f78cceaadf30103a4fc6fd29e134fbf296d3750b2523f0085e539c35900636f0d4c38d86f891661113ea2907a1ac91f9a061aac37f20 SHA512 9043484e9051e31c0a5bdb6420766f67a448b66acb1e8a6b3dabc99313a3b969e9fd8eb0437333f37295ef2202a60df67d9a25abc35dbb1e8703e163509351f3
 EBUILD secilc-9999.ebuild 767 BLAKE2B a29b9d94a0b73c83f2d3b403e85a0a8d2b279e0cb6f82af8e7efec6e4293a33dc43622aa817180eb501c67d8c42854bcd08aeee80c8f99795679f964428cc2d1 SHA512 0a179e4c5deabd685f48103c0ecc6ed190aed00122d91731a040916cd55b2853987c44cfe6315ff872119a7b53f9a1b8eea88dd7b8c24b66ba62c6cdb8e2af19
 MISC metadata.xml 518 BLAKE2B e04a38178db6390e78057059950b7c7ff090272739b618e75b5231176594a7fb3c2df88cfbf63575a3805bdb22f87c7f6aba7044bfc0c2c5e6ebdfef18b47d95 SHA512 a0d7f84a3578791107f46664b0da8078c37cf9a976d8aca31d462d2b19b82f1c7a0c7d5d43b9af59736983fa223238aabd1000d4eaaf18ee0a7759e2d6b0ce81
diff --git a/sys-apps/secilc/secilc-3.3.ebuild b/sys-apps/secilc/secilc-3.3.ebuild
new file mode 100644
index 000000000000..04666a2f99df
--- /dev/null
+++ b/sys-apps/secilc/secilc-3.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit toolchain-funcs
+
+DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}"
+RDEPEND="${DEPEND}"
+BDEPEND="app-text/xmlto"
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+src_compile() {
+	tc-export CC
+	default
+}
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index 0f322318726e..a35a60fff66f 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,7 +1,9 @@
 AUX selinux-python-3.2-optional-networkx.patch 9043 BLAKE2B 326638e25813f0183906f112f20b971dc95edd3fa99d8614435f726ab49c97c21b00acb6b999aba762b7077059904e20e7646fc66fbe87c0b5ba628c0977ab8a SHA512 9e00c162fec9e9d716e95f8e4aac519d2f4dbe82b94c6304e47f38820443841c35ac2595a92c9a03b013deb3ad150670aa5bd7976fa1487e0ac7b019a0860dbe
 DIST selinux-python-3.1.tar.gz 2100549 BLAKE2B c5d207bad60c379259e3bfc8f029f76d4572818cdd41a263498ed4434a70eaf7ff51af7772cfb27de0e9e4af03bcf9906ab0f6a59e88de10e81cbe0e8c5928b8 SHA512 5dd98f77ae8ea8bac6a89ec7def76e12496b9a9f8c9612c4cc1dac7a8e8c60380a00c857426bfefbcb4273706addd2594e9b467f69408ef284f082a09d45bd49
 DIST selinux-python-3.2.tar.gz 2101106 BLAKE2B b4b185a7468de68eb2146011a9bc82ffb7db9878517833c1e8dfa23279aec3dfbf46a27b70b17c1e317a2c939bcf6d1748638fd4a078325b853de34ae3c51a6f SHA512 2c3483e27c4ad6942e23e39897e0eccf61b95d685ace62315678cb49739d300d4ca4a7a51fa7a9aacaa98737446a70923855d15827eb6275ffd6999be0b2a755
+DIST selinux-python-3.3.tar.gz 2101584 BLAKE2B 603aafbf316b744098bd34c79bf384d55624c086fd75147675a4a0715df3d61710a99d490f30b78d59a2c2a85fcc4db91772c24644a963b31e1a0d305c4bc83e SHA512 a69948a8b139a309f18632440e4204f49832a94b8b6be50e162d3dacb16698effeb1a77c44462e8cc7dc3dd600b887b9ab2fef618c31d3e0fe0de216a6aaebe3
 EBUILD selinux-python-3.1-r2.ebuild 2548 BLAKE2B a449b67df1783f7a74859bb5fda7c6c17d4c71c21abb5e3f286872befd15c6f8b85b0a12b67232682bc4e5bcdb6701c0b926d78b4b428d56cec6f0f264072ca9 SHA512 a7ca65aab8c6c7fbcd16e1b26a0b21569f72ffc10e7784ca6cba5cbc1bf4cb57fc846095abd0056d0e4ddb4dc6065b464defef55053e4d554cf5baa086bd70f1
 EBUILD selinux-python-3.2-r1.ebuild 3151 BLAKE2B 159662cefe46f74a32aeec0c15fd580e08c575e8cb7f46c5b7f8dd0550add8d435f5c1f12719c0e1f0cc171321f58a25613f3a7985ded8abfefd017496e7b621 SHA512 90c34db3aa7db0cf058635fa6da82b71d9c2f7c23f8c154bf7731545b4279451464df5b294440ad31c7f79bb5eb44ba6b9e84e7d88af27580fc2585cbd05b330
+EBUILD selinux-python-3.3.ebuild 3091 BLAKE2B f808560e53edca86a9bf4048f90f271039c7904da00cc71628ed3e34abbb5c57607ce8dfb408cfcfb98218baab88ffe95d13f044451b9fcbd3023c669ad3d6ba SHA512 badf21087e5b5d43791c2351c25ba2c087e9db7b1ef1a4db3a9bdf9c4283a03399cb999acb5dfb88e9c13c21e1c82f5684f0c041f0f5b081b9861eb2974aac0d
 EBUILD selinux-python-9999.ebuild 3091 BLAKE2B f808560e53edca86a9bf4048f90f271039c7904da00cc71628ed3e34abbb5c57607ce8dfb408cfcfb98218baab88ffe95d13f044451b9fcbd3023c669ad3d6ba SHA512 badf21087e5b5d43791c2351c25ba2c087e9db7b1ef1a4db3a9bdf9c4283a03399cb999acb5dfb88e9c13c21e1c82f5684f0c041f0f5b081b9861eb2974aac0d
 MISC metadata.xml 558 BLAKE2B 6fba5f27d19e5ea730bd1bfb9b63c536a86f0b47c7156388df9e9af9bda8856c8e4291bf822b469afb333638504d75f64215ef86f3bf65b68812a829b0e94f38 SHA512 df8eaff3f7e69d8d0f437d29dc38b654b81a5769c32e8c0fb98aeb83cf18a1598845d03d177b1837a6b0b628a34c524a52fae5672b7c186a6a8567f349b25304
diff --git a/sys-apps/selinux-python/selinux-python-3.3.ebuild b/sys-apps/selinux-python/selinux-python-3.3.ebuild
new file mode 100644
index 000000000000..8e1f90984a8b
--- /dev/null
+++ b/sys-apps/selinux-python/selinux-python-3.3.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="xml"
+
+inherit python-r1 toolchain-funcs
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN#selinux-}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND=">=sys-libs/libselinux-${PV}:=[python]
+	>=sys-libs/libsemanage-${PV}:=[python(+)]
+	>=sys-libs/libsepol-${PV}:=
+	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
+	>=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=sys-apps/secilc-${PV}
+	)"
+
+src_prepare() {
+	default
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+
+	python_copy_sources
+}
+
+src_compile() {
+	building() {
+		emake -C "${BUILD_DIR}" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)"
+	}
+	python_foreach_impl building
+}
+
+src_test() {
+	testing() {
+		# The different subprojects have some interproject dependencies:
+		# - audit2allow depens on sepolgen
+		# - chcat depends on semanage
+		# and maybe others.
+		# Add all the modules of the individual subprojects to the
+		# PYTHONPATH, so they get actually found and used. In
+		# particular, already installed versions on the system are not
+		# used.
+		for dir in audit2allow chcat semanage sepolgen/src sepolicy ; do
+			PYTHONPATH="${BUILD_DIR}/${dir}:${PYTHONPATH}"
+		done
+		PYTHONPATH=${PYTHONPATH} \
+			emake -C "${BUILD_DIR}" \
+				test
+	}
+	python_foreach_impl testing
+}
+
+src_install() {
+	installation() {
+		emake -C "${BUILD_DIR}" \
+			DESTDIR="${D}" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)" \
+			install
+		python_optimize
+	}
+	python_foreach_impl installation
+
+	# Set version-specific scripts
+	for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
+		python_replicate_script "${ED}/usr/bin/${pyscript}"
+	done
+	for pyscript in semanage; do
+		python_replicate_script "${ED}/usr/sbin/${pyscript}"
+	done
+
+	# Create sepolgen.conf with different devel location definition
+	if [[ -f /etc/selinux/config ]];
+	then
+		local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
+		mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
+		echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+	else
+		local selinuxtype="${POLICY_TYPES%% *}";
+		if [[ -n "${selinuxtype}" ]];
+		then
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+		else
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf;
+		fi
+	fi
+}
diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index 94661edf5e4b..6bf4ac9d809c 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -1,6 +1,8 @@
 DIST semodule-utils-3.1.tar.gz 14257 BLAKE2B c8c9a1ce7c9c4f53b1f4c728d16b149fdc284f4cff8b4fce0cb59b77d37d6d7e9bf2102c7177c4eaf94677af6147e42d8d0bd55c0bf3a358968d0162d5a6c65a SHA512 b92794bbfbce5834ee7f62fddb40b5506e9291e8fa7c5d669b2e281089b8f8dc40c4522ea287ac5deffdaee751442ba8e691e2ac45fdd378b60d5d6b2527d157
 DIST semodule-utils-3.2.tar.gz 14260 BLAKE2B 35c071c96071028d4a912a89b88d02672f1fb8c2d8d23c3cb472b607dad55acdf351ef870b4d52bb2bed7b816a199c18947afcd16e77b66268822288feb4af2a SHA512 f937647cc22f7ed719908bad64415d706fd97cf1dce484dbca2484b05b3295de40e31bec643b6caaf4e8be742b1f911428d393c5e2d1d0ae39a2a37fd3be9bc1
+DIST semodule-utils-3.3.tar.gz 14268 BLAKE2B 5b03dd731c28e29b146e9f75fa7ce5151e58df1ea6598356b1ad9ee6846d2ebf7ceb57c740aa0ae4b94e0a7356180bd8e608d6a9543b48251e553036f2b2833e SHA512 76aa0c9322889c7de100f3c5789bdf27b7073827fe2af371bd50a4517baa8442f35e53f16a93227dce93da0ceb054bea7e5ee17a46fe05e06f3c2d9925cf59dc
 EBUILD semodule-utils-3.1.ebuild 937 BLAKE2B 2a17b566209258d0f47adf56d8c38f7c920f6ceb053e07bfaf7dd51139e39a42cc60a4e1986ccb19b50c4bc89b1c97b3a133c02a38431127dfd17200e361e535 SHA512 e36fad3f19c5f81791e57a02ff677a42d02e8037b4cad66d24d7bf37fa50863954c8fe58c18d1416212d24537febed8b91bdfa6fa3ce9c79efb5c80675b3d476
 EBUILD semodule-utils-3.2.ebuild 808 BLAKE2B 0b1a8904210665e80b85aeb592cb9bc0e0eb574ab6dc8583f58ab22c00eca0c38cbcae0a6e8ad3f46cb0a7dab43bc8e74c1b26aa681fda8b04a8773926becd25 SHA512 95cb923afba92ed58410961e31b72c99e2df03dd62659a51497de35c6c8d0cb985e1b56582abee87c9f4d47f483343a9a0791429785d59a1c5dc11a92b4f6e1e
+EBUILD semodule-utils-3.3.ebuild 810 BLAKE2B ec38af054d489b5782728e6c61f75e9b537c22fedc0babfcc9c9760cfd1af93d9ade3aab08a53374586497724fa3812d9c6c2817ce061bf00aa1a0e81cd2d433 SHA512 e524646d89401e49b007ff969ddce63e06efc42bc16960bda20b84c03c1cb6b98e89ad0608eb24208cf9f0afc0ef8d786bc58430f28935ae524f6b3a70fad069
 EBUILD semodule-utils-9999.ebuild 810 BLAKE2B ec38af054d489b5782728e6c61f75e9b537c22fedc0babfcc9c9760cfd1af93d9ade3aab08a53374586497724fa3812d9c6c2817ce061bf00aa1a0e81cd2d433 SHA512 e524646d89401e49b007ff969ddce63e06efc42bc16960bda20b84c03c1cb6b98e89ad0608eb24208cf9f0afc0ef8d786bc58430f28935ae524f6b3a70fad069
 MISC metadata.xml 401 BLAKE2B de9fab42212c80ca7439bc2f09693f17a5da3e0c412a1599e12c9c02087487a68836ecf651b8b016b3215552cc88cd8b398d42eac783f0039d10d962205d280a SHA512 28d7ee52e3e1a41366554857904226d1fa9cea07726538c06913c65f7c12ea9d70a5d6ede253659e14f7672f6cedd90ac4ac572462220493e256f640a40876e5
diff --git a/sys-apps/semodule-utils/semodule-utils-3.3.ebuild b/sys-apps/semodule-utils/semodule-utils-3.3.ebuild
new file mode 100644
index 000000000000..13fc0d86279e
--- /dev/null
+++ b/sys-apps/semodule-utils/semodule-utils-3.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+IUSE=""
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DESCRIPTION="SELinux policy module utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}:="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+}