gentoo resync : 12.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-12 21:55:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-12 21:55:15 +0000
commit: 7218e1b46bceac05841e90472501742d905fb3fc (patch)
tree: 56fae051db521b8fce8014cbc8b11484885b14b3 /sys-apps
parent: 6d691ad5b6239929063441bbd14c489e92e7396e (diff)
45 files changed, 757 insertions, 435 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 45fb65bc02be..0b931f0728d7 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index db65b57bc180..011df9073d0f 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,3 +1,5 @@
 DIST acl-2.2.53.tar.gz 524300 BLAKE2B a4c602b18ab1a7932dce38c8dacf3a3026a3100a8a7e61f0740886ec7154a7738ca641953dc1253b5574580815d7f547a99bdd0cc0ee87238a1995abe97eb9d8 SHA512 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716
+DIST acl-2.3.0.tar.gz 518155 BLAKE2B 8635e8616a94f6f62de7ece2ccbc789d48f081608493b759150f4bf9d1c98098f5660cc1ec95c8a54bbd0e7295245e1bf77f4afd17f8521172bed790ce217c88 SHA512 77c0f387955d98ee086020943ea5d50ddcf5a36981cb28d2e90c74c20c3893c13c3fa9bc5bc47f79957987ec19afd00ad0b144a1387562b887c1f5fb5e6850cc
 EBUILD acl-2.2.53-r1.ebuild 1388 BLAKE2B bb54a8d13adcdbc8c349501a314f08dcbbcc88ba35c511ed9d000f34495652474fa021e4eecbae1dd77a5b7ac6a04fbdc008aa07207dc79a216ab1518fb240e5 SHA512 ef48ffdf0891f550ae6b86d5b81cc00436ca791fb5583d976e6bad502e6a410498f468526fddf69ff1ec58db3c8c32e1803fe9d2ab2333dc983e6eec70cc0e53
+EBUILD acl-2.3.0.ebuild 1397 BLAKE2B b9487ad365a7995fcd3e760bf20fca375dafb60433d631f185f02e94e5bfb1b48b7718ccd61c88d012761b6440adc2fff6441dab1122cd0656956a2de65e4002 SHA512 0aed518a74b5a3056245850ccba6bed2dde5fb86859c4f8fd6279616e0a026d50b77f38da49407fe3dca25b2881b285beddd9cd0bf4146f9209d4e528d006317
 MISC metadata.xml 293 BLAKE2B 2b8092a768f4f905c414e9bde92180e659085a60fd6ec13cecb29b6a88471941e7c8e2ad86f2864f44fa4f74589b20433ce64c3e89c3e210838b9d997deda136 SHA512 1e61b3f2d76e95eca037de073678326400b069526c8a308ca4169ce67d3e47c8cd199cca59f83fa245bb5fcbaa9efe7f31e34cf8588d69383ed0da78ab54cfaa
diff --git a/sys-apps/acl/acl-2.3.0.ebuild b/sys-apps/acl/acl-2.3.0.ebuild
new file mode 100644
index 000000000000..b802802db8a9
--- /dev/null
+++ b/sys-apps/acl/acl-2.3.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
+
+DESCRIPTION="access control list utilities, libraries and headers"
+HOMEPAGE="https://savannah.nongnu.org/projects/acl"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls static-libs"
+
+RDEPEND="
+	>=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# filter out -flto flags as they break getfacl/setfacl binaries
+	# (bug #667372)
+	filter-flags -flto*
+}
+
+src_prepare() {
+	default
+	elibtoolize #580792
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		$(use_enable static-libs static)
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(use_enable nls)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	# Tests call native binaries with an LD_PRELOAD wrapper
+	# https://bugs.gentoo.org/772356
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	default
+
+	# move shared libs to /
+	gen_usr_ldscript -a acl
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}" -type f -name "*.la" -delete || die
+	fi
+}
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 8d2f3caad667..d7b03d001324 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -2,7 +2,9 @@ AUX attr-2.4.48-perl-5.26.patch 785 BLAKE2B 307e652d83c5d623415ae389f01df918c552
 AUX attr-2.4.48-switch-back-to-syscall.patch 3889 BLAKE2B bc308b40781abd79e8a45bcd7509bbc7924d44e0109b521f52d07d705bdfed9f80badeb8ba2aae44fd5350c36f54ebb31ec7273abc5f388ca91cd60dcf148c2b SHA512 e0e8c6bb89a42e91ff0daf3bb2aa7e75bb26ebd6f59d549cc037db8d156e03cef195fa7ac813f8cd22325583cf9e81d6782ec06a8f5e5f8b4eeadc104a6c5492
 AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8
 DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3925d5da5eea007e14f5d9e309f98290b7ffaa6c62f620ff8f3ec7bfb3a1fcb04f3c0c072fca5feacaf804c0 SHA512 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923
+DIST attr-2.5.0.tar.gz 465575 BLAKE2B b50c6b741543140099e7f31fcc327d4547cda41f1b14159664096b571c5c14ed7279992e94fdd9bc23d5618715a7d4fe8d45ba8d5cc2941ac6a4d242bc80ee09 SHA512 900e66d13acd022f52986d4159925b23e60f9ef5d11983b16d9dfe4a98fd70eea5f78e18f3694d8adea1c422324772af4da6b5659d755ed37484b428e28bb5fc
 EBUILD attr-2.4.48-r4.ebuild 2352 BLAKE2B 7d90d8442281a18b198ef654a115accc7228c66386dc4b453dfffc1bf8b80b7d3978ab83b8f520be7935f114fdc5f9391124b6628b3dcc15ad6ea67bb65a761b SHA512 16be12e9f26b6140f66e4b67533945e17171495951e17c0384250e32a13159e8572f80d505b0d6b76bfcaf47297420044e815414d2862284f0bda5f669bfadaa
 EBUILD attr-2.4.48-r5.ebuild 2584 BLAKE2B 44947dccaf200cedddc154153a957793b6de341b00ac395aba99b5c047f116eaa8f049ed2185d054261bb917d992ffa8c0bf79a53d6549ed2e26be0e3e0dc17b SHA512 7a9dfb9696cc8c7a452b21462be7f1c319042ea78aaad6cdf31cae1f48b229f7c390fcae4dc2ed20b24f9724e50f298ce4c706a238538976871a43e688c046e7
+EBUILD attr-2.5.0.ebuild 2476 BLAKE2B 6d56f388398ce510fd63a12496d3ff25ab7f28fcd18afc3f428e9b5350c7cc362943e0022810afbef378d0e242e7d7dffc48eb82fc60ca53866ce0226dec20ba SHA512 b5ffc538b2d87b76900e748edf273a45b10e25af43f340f6297c4477a28ceda3b61f1186506f72b8856a203abce63770a1aa108921701bdc004bd748d746db41
 EBUILD attr-9999.ebuild 2476 BLAKE2B e5531eae4407b8ea7aa21a00a8eac0c63fb2f2f3745030b8acc20780c896660c67e470ff562940f55f6074b641b812be9aa455c0c6e6a7b4353fb82bc3ff044d SHA512 9fadedfc67e6f03d1ebcbb0b8bbf64a47cfcea0f8a1d4e7c3e42c1ad4de2bccf2309775eff8d473892867339da0afea98d88d009a31ece6ce809c8b3a29a82de
 MISC metadata.xml 336 BLAKE2B 228b1ca58194e3cb6b68721379b55f53c2676973b7fb626600ae4f1d5da4899d7d4dd6e5211704ff6f64f601fc456b4335c4f01233768d2512058ee63af60668 SHA512 0e68e3406c4e54082edd2b2be1fe8b5a2a73457331b133635c5b5ed9e0afb0fbeea2101ff17a0fae0be47c4e535af9cd084f1abc9c85fda05c18e2879a72d0bc
diff --git a/sys-apps/attr/attr-2.5.0.ebuild b/sys-apps/attr/attr-2.5.0.ebuild
new file mode 100644
index 000000000000..7465baca96b8
--- /dev/null
+++ b/sys-apps/attr/attr-2.5.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
+
+	inherit autotools git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="Extended attributes tools"
+HOMEPAGE="https://savannah.nongnu.org/projects/attr"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="debug nls static-libs"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles || die
+		eautopoint
+		eautoreconf
+	else
+		elibtoolize #580792
+	fi
+}
+
+src_configure() {
+	# Remove -flto* from flags as this breaks binaries (bug #644048)
+	filter-flags -flto*
+	append-ldflags "-Wl,--no-gc-sections" #700116
+	tc-ld-disable-gold #644048
+	append-lfs-flags #760857
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable nls)
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(use_enable debug)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# Sanity check until we track down why this is happening. #644048
+	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
+	if [[ -e ${lib} ]] ; then
+		local versions=$($(tc-getREADELF) -V "${lib}")
+		local symbols=$($(tc-getREADELF) -sW "${lib}")
+		if [[ "${versions}" != *"ATTR_1.0"* || \
+		      "${versions}" != *"ATTR_1.1"* || \
+		      "${versions}" != *"ATTR_1.2"* || \
+		      "${versions}" != *"ATTR_1.3"* || \
+		      "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
+			echo "# readelf -V ${lib}"
+			echo "${versions}"
+			echo "# readelf -sW ${lib}"
+			echo "${symbols}"
+			die "symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
+		else
+			einfo "${lib} passed symbol checks"
+		fi
+	fi
+
+	if multilib_is_native_abi; then
+		# we install attr into /bin, so we need the shared lib with it
+		gen_usr_ldscript -a attr
+	fi
+
+	# Add a wrapper until people upgrade.
+	insinto /usr/include/attr
+	newins "${FILESDIR}"/xattr-shim.h xattr.h
+}
+
+multilib_src_install_all() {
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	einstalldocs
+}
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index adb5c39764cc..a87aff1f4399 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,5 +1,5 @@
 DIST baobab-3.34.1.tar.xz 458500 BLAKE2B 1f27640bb369cf1712c7b1c79d1261fd4a99e427a99debbf7d2f31f191f5e0ddaec7b366cb6b34add6a552c9728b9b1f4b64bdc05f06b29e0071ccad73a77c6a SHA512 8234f26fde68d6ebe578360345dcb45314b6a818aa899f858b7e3b9ae1874165e4f1d644d169d6ba56270689a34e8cd78d993e99c08f66b3f2c7c9fd0b7ea516
 DIST baobab-3.38.0.tar.xz 579948 BLAKE2B b0ad702ff105e8308b7b9a5904b9331c0fe99db8b78a154a4b67ebc8b09992d967d896c713df42640319bab3c03de1130b88daf4f23be996ee3bc0bdb633a625 SHA512 764fc97ccab01d056fb657cda3c04e742d865e4c6ca16d4a5212a9d5470e961c8fe3523a27ab28945c38c25c1155903897e178b9ffaf0a6c07c6a044e29a750c
 EBUILD baobab-3.34.1.ebuild 741 BLAKE2B 10803eba1cddb0f50d6520faa8b966e7a97461f99b0187782aa2c02f2ee559348bf0c43bd2b87f41a62e0cab128a5e66ae69a28cba4504294b4ce831c7b1dce5 SHA512 6aa9a9e559875b149d3872f884c9d0bd60cd0ed6287da38804211fa14e2a2567cce76cc22be364cb70e157157ade86519f02a415fdf60c456ddaabe16eb00b40
-EBUILD baobab-3.38.0.ebuild 718 BLAKE2B 2b8bc2af32093e388ca506c0360d46542d874fede9249764587d80412643928cb02ed5d94eeb22bbe0fcda3f40afa1c7e7e15970dfaff1f8c9a6c63cac6e8e7c SHA512 c5a9d6edbe5ed7241299eef69301302112b914de3696eaff4f7eef79ee08aa5618cb6e5ede05fe2c911a704449e0a0575e74c24c23d9d3394348b1c95d5d1b1a
+EBUILD baobab-3.38.0.ebuild 717 BLAKE2B a5383d37770463b26d900cc56f46cd9dca2146e05891c7baae6d39d4686f183d9b7bb2bc0802bc522bcfbf20db6b79e78a99079c97ac8918c1e865d1c8cd3603 SHA512 84418b7ed2944bf9957f660ce4cc619e5764c2a165cf0422e4a63c4c37bccc9b8bccd7a023f2c8b4a45910f40956d937783a1e9e917c27f9c568705d8ac3fd95
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/baobab/baobab-3.38.0.ebuild b/sys-apps/baobab/baobab-3.38.0.ebuild
index d979140c6051..31b963eaf1c0 100644
--- a/sys-apps/baobab/baobab-3.38.0.ebuild
+++ b/sys-apps/baobab/baobab-3.38.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 18947baea3a8..1a14d81a25e8 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -3,6 +3,7 @@ AUX file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch 1184 BL
 AUX file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch 823 BLAKE2B c2d4c40224d2fa3db4ca0069e1f5bf111cc782879c97f642d91dc4d545544af22ed11bade5c014494838d75ac8e4d607009af77d0dc9d3457d1eb28d8e2ea192 SHA512 4ddc901be88b61ab860817daeb9f4021a6dff1473d0a64ff6409b8327e07011b1d86f2a2c54e1751d03518fa5def25fed644c1a6cd691f2737b526e43098603c
 AUX file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch 813 BLAKE2B e0d0168f41eb868131cbed1e657f4a1e4f4d1f29d22f4a4685b43a6bece5a9229a25a1d96bbc4deca065dcb6342d388ebe86e984e3dda66729f974bcc4e7a32b SHA512 eae1267cf6f49d448cad51f3ba97cd1f8598bebccc014b8702cf3ea330184718dacd1570f20efdd119951b55fe57729392197cb86f89dcce23654e745c846417
 AUX file-5.39-add-missing-termios.patch 917 BLAKE2B 12a0dd712fe7b3755e5fa6dcda0d3a5586be36b0e4fee237ba86b9dcc7b533e57f6094e49599489b8563756764c8a7d6c31d9d20245cb3971c4944ee05413cc2 SHA512 a56a617a212f2e0e348d358e09076ea25bd396f426ce4ab7c090ba702d2d20fdc5b425e2a7baac5abc78bab0320fe1b917b511c0a87b40067f7f1489508107e3
+AUX file-5.39-allow-futex-seccomp.patch 473 BLAKE2B d575e64d3d3b7f772b240bb30ad171a85e69b5282dbef43ece466dfcfed4b1ead9c8f038948010e00d7c0a029d8896d32e252ad02789725eb9fa2d61f3abf1b0 SHA512 c22098f467b41f23f9b94dae91d89008c01b5bf7534df662541bd86170feb64190a4b742e2d7130fd57973b4d565d8bc63d0d67d83399afec943e00f2ad5b847
 AUX file-5.39-portage-sandbox.patch 604 BLAKE2B d755d85ae85826df5d2beb2d05f570e230af671c23f27bb1e3e811d1f2f710ae3d4f14d271f9dc4da4d1aa4e71070561d1121deaccf8781de72ff9aec059caa3 SHA512 a65368ed9225b0ca6e7341283a20b308c5d5ca38838849d5228be762d4d87de0438084af8f7cd7b6ee1a707125226940490a80cc1eafc2c817fc865a6211c890
 AUX file-5.39-seccomp-musl.patch 1021 BLAKE2B ffb395d7ebf1a96a7f74c8c8462e561f31a6d46bf8d0b047b370edd0bc9ada254ddfdf1de6217e0d1e85a973880c1f55add5c8dbd40b9db4c693c36d15c5250f SHA512 d5742e169c0a5b40e8dfe3830caf5c6ee21d09122ae409c4b3f357cb517abb8a39c6af2ba6a51fa9155437ae6aa5f30b76b1f8f3d31be9bcd6e6e4e666be1a87
 DIST file-5.37.tar.gz 887682 BLAKE2B c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7 SHA512 bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
@@ -11,5 +12,6 @@ DIST file-5.39.tar.gz 954266 BLAKE2B 4d6d9a6317961e0a2aa391f502b0be8bbb40ede57c3
 EBUILD file-5.37-r1.ebuild 3153 BLAKE2B 19df45e9db45ca58085f3758d9396a074b6cd3a2475228ff7774551e85adb321203091958ae36eaa2aa12bbbfc2bf7aa79ad1e8b95345a106accd20fd621f54a SHA512 786d0ad8abe705e1e5ed1c3604dc4d6e4ae00ab27150368dd00475baefaeb37ec72c45297fd68def3fcb276b2ee29a8b8982e0010223d87df55450d49c8a1d76
 EBUILD file-5.38-r1.ebuild 3366 BLAKE2B cde302d8a08639b8b2a5f8aec2f4f00a0dce1bcc7a9b34b7ce9e2786cbc421659fba7acd50d81b90604dcdca84ee3ef9d8fb7bb431d01a98a2e47c7a82832e37 SHA512 af1fae92b1c27efb812b4a6b6944f9ebbdd35e0cf852b6e69bde503bcc9c5c08e97d4e7eac7139e674c4651650eb5e853dd3e3d4ee094d234d54606dd66b13ff
 EBUILD file-5.39-r3.ebuild 3390 BLAKE2B b8443b97f7364c7958ead19c0485321f821fe2a3c5d489be5c25a2dd9257faa0937cd0ddf900f860bd1790a2c196cc8d8566c65139619777335d742605e3d9f0 SHA512 6f8ff5ff5658fc9abe9d7803058763cf76ff63f269482c74956756befc95b993d2587f94b428305e19e5b66fb6b95f04d4eb32be4264bdf60cff07cbedbe0088
+EBUILD file-5.39-r4.ebuild 3458 BLAKE2B 42284b9cca829b4602bc383761feffe15f2eb1e6c3d6732edf6e71937702b9de0546baefe47e318a29b0c3e1535a3c8fc1b325ca73e9a2c80ef0d4f4bca1268d SHA512 cd689bf33cdcaef5f23b239103c6ba5ba46a0194007ef8f81c616fcd185c2c0d79ba70dfa250df6aba39373cc346e5fb77c8c6e17e264df4f2b379b311b9164d
 EBUILD file-9999.ebuild 3296 BLAKE2B 6e56f6436decee04e4c97dfccbe87d5942e328b003a7898e4ae12bb8a9c8c5150c0cb4b304cc3488f6698f2b33456e2d296dddda709cc351f69d07ac95378647 SHA512 4842d01087da26426d0ebe4438e2d20da6653e258e3848f2e01b0433856a9c08258a0391b6a6455714682baab67423660570f01cdd927bd0ed3c5fb4fcd2438c
 MISC metadata.xml 381 BLAKE2B 242f4a2403d0a4c69c7ff400fdbd447bb7fb8572dc57dc05f3edd0c875da68433217bec46d43467fa03c5e9ec69616e3450635ff2662ae3ed830a138521e23ab SHA512 f69d67890ecb0b574d414c432df12f6e8d31ceb7755055683941017563da8713d07728e49cd4a7277699a97cd3ba732c946ecf5435cee94778a0d5652e7d6857
diff --git a/sys-apps/file/file-5.39-r4.ebuild b/sys-apps/file/file-5.39-r4.ebuild
new file mode 100644
index 000000000000..70dea08b9d9f
--- /dev/null
+++ b/sys-apps/file/file-5.39-r4.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/glensc/file.git"
+	inherit autotools git-r3
+else
+	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+	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"
+fi
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="bzip2 lzma python seccomp static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )
+	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/file-5.39-add-missing-termios.patch" #728416
+	"${FILESDIR}/file-5.39-seccomp-musl.patch"
+	"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
+	"${FILESDIR}/file-5.39-allow-futex-seccomp.patch" #771096
+)
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		eautoreconf
+	fi
+
+	elibtoolize
+
+	# don't let python README kill main README #60043
+	mv python/README.md python/README.python.md || die
+	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-fsect-man5
+		$(use_enable bzip2 bzlib)
+		$(use_enable lzma xzlib)
+		$(use_enable seccomp libseccomp)
+		$(use_enable static-libs static)
+		$(use_enable zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+	local myeconfargs=(
+		--disable-shared
+		--disable-libseccomp
+		--disable-bzlib
+		--disable-xzlib
+		--disable-zlib
+	)
+	tc-env_build econf "${myeconfargs[@]}"
+}
+
+need_build_file() {
+	# when cross-compiling, we need to build up our own file
+	# because people often don't keep matching host/target
+	# file versions #362941
+	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+	local ECONF_SOURCE=${S}
+
+	if need_build_file; then
+		mkdir -p "${WORKDIR}"/build || die
+		cd "${WORKDIR}"/build || die
+		build_src_configure
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		cd src || die
+		emake magic.h #586444
+		emake libmagic.la
+	fi
+}
+
+src_compile() {
+	if need_build_file; then
+		emake -C "${WORKDIR}"/build/src magic.h #586444
+		emake -C "${WORKDIR}"/build/src file
+		local -x PATH="${WORKDIR}/build/src:${PATH}"
+	fi
+	multilib-minimal_src_compile
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		default
+	else
+		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog MAINT README
+
+	# Required for `file -C`
+	dodir /usr/share/misc/magic
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_install
+	fi
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/file/files/file-5.39-allow-futex-seccomp.patch b/sys-apps/file/files/file-5.39-allow-futex-seccomp.patch
new file mode 100644
index 000000000000..8d9e3d1eb660
--- /dev/null
+++ b/sys-apps/file/files/file-5.39-allow-futex-seccomp.patch
@@ -0,0 +1,18 @@
+In some situations, futex() is called even when lzma
+support is not compiled in. Let's enable it unconditionally
+for now.
+
+https://bugs.gentoo.org/771096
+https://bugs.astron.com/view.php?id=241
+--- a/src/seccomp.c
++++ b/src/seccomp.c
+@@ -175,9 +175,7 @@ enable_sandbox_full(void)
+  	ALLOW_RULE(fcntl64);
+ 	ALLOW_RULE(fstat);
+  	ALLOW_RULE(fstat64);
+-#ifdef XZLIBSUPPORT
+ 	ALLOW_RULE(futex);
+-#endif
+ 	ALLOW_RULE(getdents);
+ #ifdef __NR_getdents64
+ 	ALLOW_RULE(getdents64);
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index 45e7427801a6..43b6bbef6456 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,5 +1,5 @@
 DIST flatpak-1.10.0.tar.xz 1504300 BLAKE2B 213fb5449b075250cbec9f43ea5b02afae809b8e58d3be0afd39a70d78431f7efc7912462ce46061a53aa4dc2ef8f5e9504cdaffe4b39d2f53292736442ceb3d SHA512 8eaabd66cbd26f5288fb72cddcd195ea4702243e9f5ceff425836b5f305e2b7a4172e67d30cc0e74ad97937c007e8f4ab81080a7ada3f528d05f74845c923aeb
-DIST flatpak-1.8.5.tar.xz 1430600 BLAKE2B dfa589073d3147725144c6c9c8f720a8b32918a6687a28af0f0284063e07278ece2ef191343b603e541401a5816ec095dbf3570ab7f27bba186ac416a359fbce SHA512 bdd330376e3d9ce184717692ee12f2b1ccbf1400411133ac955ea21c2d5e04ea7af9709a61ae897eae17fe258e40048576c2d829290721f349de7e6d74a9de71
+DIST flatpak-1.10.2.tar.xz 1507856 BLAKE2B b19b04d536b43a7bbb7f479e495538137402ff46bee3be5d180d12983c4e69b8726628bb69aea64917163a4722a34987b631a073c94083cae50d79dd7d74db20 SHA512 c932b9aa2803aa5b453917174bf282d82924aca7341d72555e2557fc588ccefa0eaf32b956f75752c17cd8f73b687d4a688ebd64df36680b80b5ff5750468597
 EBUILD flatpak-1.10.0.ebuild 2343 BLAKE2B ac0c0593efb4dd67708f92eb67b3d8967822e7052cea13bde89620b8548a9952e933a851a47dc4898994ad9c001088b4997730c7e32d4a104634a71567eecb99 SHA512 318b49b5bdd1ff3c0a84b3c23e1c27161a57a5a8e9e27cb483b28da4f2acc8f1566ce89c6c3bd9ffef44bb8b0478520f4a55a4095c0e6f85639f248a7a08fa5c
-EBUILD flatpak-1.8.5.ebuild 2346 BLAKE2B 1295a9f66a941ce5f183175c98e3a5b5f56260cf38212cf3255ce61f49440e05e0e84571c4e07dd11b8cb9a834e77c9398efdc879f033c72874d2440b66d809c SHA512 27ff9ef463217a01888a0646e859dd2b414f6413a45db21ce5dc6e84d19e35d8bedf5dc1b149534720c33678bf94f0e86fd45f60581df4cc3ba9725842effe30
+EBUILD flatpak-1.10.2.ebuild 2346 BLAKE2B e74ae812d21e8d3eb73924c3b10818c502f5d072558206fcb8bda1e3491ca1f6bd52e7cdc1d51f222b7aeb5ec6bcc58dd1f3c890eae1e10508b686057bbd28f0 SHA512 01e277ddb3e6025dc856deb2f01d6ee50e4d2af37940b38fcea6c32a91c6b73a3590073880edc95bd18a3cc4d25d0c18e46ab9a11d6334737055d4aa1d9cec1e
 MISC metadata.xml 324 BLAKE2B edeb76b1ab3c052555564fdca397116a0ca48a7b2eafddf8958e080a7c8ccab9a04613fe67504c4c1d51d75eccc8cd25cc0d4223958f21e37f8ae056b3fd4686 SHA512 667951ea59e4871daf2508bdb4e56a68638d37bbf6fce0a56923cf3c0632a28d2eae3aedbc38e8db04e80c03fe06918569b1697e890bf20055add72ab0c7c15d
diff --git a/sys-apps/flatpak/flatpak-1.8.5.ebuild b/sys-apps/flatpak/flatpak-1.10.2.ebuild
index 80b3f809a200..6c69987f33c5 100644
--- a/sys-apps/flatpak/flatpak-1.8.5.ebuild
+++ b/sys-apps/flatpak/flatpak-1.10.2.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-libs/libxml2-2.4:=
 	dev-libs/json-glib:=
 	dev-libs/libassuan:=
-	>=dev-util/ostree-2019.5:=[gpg(+)]
+	>=dev-util/ostree-2020.8:=[gpg(+)]
 	|| (
 		dev-util/ostree[curl]
 		dev-util/ostree[soup]
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 098bf6a001a8..d0dab1ff1bd3 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -5,6 +5,6 @@ AUX haveged.conf 147 BLAKE2B 7bdf29071f7a1a3b90266af308ab0a0a56c46f8c9ae8b6acc3b
 AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415abbbdeff3794251e911c6efee7d9331a4cb1e8dde1dbb579f46935cd52c58fbaeb77404b587985cb SHA512 7d7caaef45cbf268a1c1a813537a9e4ef6543addcfebe99fd178e37a8c516bbd5419fb8f47decf2370cee0562f066c72501b6c176307b1f5884b56f561386b88
 DIST haveged-1.9.14.tar.gz 496346 BLAKE2B 9df0b51dc5856b4b943a0c1c1c8f9b947dd3d22bdf45639920911e2619264fc771cba68ad70559b34523a6361cc5da588392bf0b24de1dbf824f1dfc7898a2bb SHA512 bdb6d9de667298d32b474bcbdd5f90c12b870b154b86f8817948de787d378b428bf823234f20129666bd1abced2f154643b5999e43975969f6bba87124650924
 DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa
-EBUILD haveged-1.9.14-r1.ebuild 1002 BLAKE2B 886fda49b906433092ca85b679b8bcddf6c6959649dbe066f90b5c0802c57b2b07deba62212043f68294a75f57ecc41fe9015d87a2f5e781e9a084b14a8a40d0 SHA512 e042a95f3810fc69e8e5bd5e2be27ad119fbc2fc1768461867d3aaa7e3f1bda7623f36b9a3aa7a45c86fdc1c054fda3e4d602fb9da85067f6f99965542882cfb
+EBUILD haveged-1.9.14-r1.ebuild 999 BLAKE2B 51afa569d19e3faf73fdbed079f0c54dafc9702a30189c08a2088638b9fc019bb1bb66c37eb36ffb5221f1446104bbb66b2625f6e8bffc195513603e8e3086a0 SHA512 23adc32646f0d46618c43961e47d681806dfa63121a27d6af36c1efe7b4f772980d697dbf6150aff19989ad5fa7201e8ccd6f9158b37bb2e20ef47191ee9c559
 EBUILD haveged-1.9.8c-r1.ebuild 1064 BLAKE2B 60289aa161de1a57286387bb5ad64e67287120e659763f3874bd10282cb32f42619d9e9c749b7a7cd2ac237208bf0ddb1ffa73550e46687d3f62f946c58a5e75 SHA512 7098595525b1d88bbf6d182332b843cb4e5c26baf450c9231a88c59d5da5b8ce9d0c045483a00213225b3b9d5fbd3bb17896183123a6e0c4321045e7f846637d
 MISC metadata.xml 371 BLAKE2B d44d1873136cfff8c9c1ae42ee0ded780af875987caecc98494afba60017c3da105423642f10f2475d344636d54c71885607649ceb4f285a477698b40449d2ef SHA512 640e188a0829d4408d9bc7ca0c7558222ed8148afef25a88a136c0ae5bb44531bc8352c9c1da1c13e395cb54d67c62a485fa4f6329ad7b76255def9d979b70d0
diff --git a/sys-apps/haveged/haveged-1.9.14-r1.ebuild b/sys-apps/haveged/haveged-1.9.14-r1.ebuild
index 832568999fea..a90d3f4023e8 100644
--- a/sys-apps/haveged/haveged-1.9.14-r1.ebuild
+++ b/sys-apps/haveged/haveged-1.9.14-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${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="selinux static-libs threads"
 
 RDEPEND="
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 3530122fef86..47a5770722dc 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,5 +1,7 @@
 AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674
 AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94
 DIST less-563.tar.gz 335508 BLAKE2B 813e54b9a115600e4f20009ccad3708efc64ab4ee940aa3624e968045557bbfef6ace49b791f4b9efff86bf43df9fe2a04a160e76718396e0dae17f0bdaa62fb SHA512 79384ff3faa33aeb86da6027c8b264df78f9f8c799af43dc5340e2ca3d86053c9be168140bfa05734a4217e65ef9939652b004d6a536f64b2e0ef3b74b07f535
+DIST less-580.tar.gz 348881 BLAKE2B f518ea569201daed6f1772df890cbd2a8968937d9b8fd7b36ae277dc4b1f928892da073266fe39e4135cba15f2d52e0e540a6033cb56de9cc7577153e41e05c8 SHA512 52ff06854f58b5f41bc49fa13334a1ba11fae9316bb99f877abebbe8eb90226991b1820fcccfa85ab8cdfba87f6872160c1177edb044df2e9dd9c1c7d44e3c13
 EBUILD less-563-r1.ebuild 1364 BLAKE2B 3ec233e47b0061ca470790d05ac51c37230ce367458263e3b583d7bfee362be31a7a31ea73f61adf8e7da040ac02542ab712ef499f60a9009f5e8cbbccd226e6 SHA512 06c13fc26c49bbad4e78d02ec0e6f193b1cc02f7b19d83371e2671c7a714d6b68569a0e19cf9ce3b090470dbdc3fa1a45040527b9d37498ca2e937561185ef9d
+EBUILD less-580.ebuild 1373 BLAKE2B 0e90c4509da6284b81b1ee9a4421cc97289aa5e2d67532eafbe1da9c5cb151ae11f983578ea13a1e131e26d15a3b1305428f07713b270fe1ea8375d79e5e666c SHA512 caa47b488beb99d13dcbbad8550c633b5f80e0fb46838bc2244bde3a9e8cd38115a675a4e1be362041bd7c6b45f9fcc77cadf851ad9ce1d263852c668932b8a3
 MISC metadata.xml 327 BLAKE2B 581c56f3073ebd542d8edf73fca5effb7cacd1eb3778b427e9b5fae6ce174931240f957be61951d2233feeb899e5eb08317f9d05f223532b532dd2467856d101 SHA512 dd40867f5f419a029deca5f613b89651fbc6fc71fdd9bf18600f063358295de781390037a1b2c0d28cfc8f65b56e71e9923f231a16a672dc8bc1284104462b95
diff --git a/sys-apps/less/less-580.ebuild b/sys-apps/less/less-580.ebuild
new file mode 100644
index 000000000000..c91345dc9f3b
--- /dev/null
+++ b/sys-apps/less/less-580.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Excellent text file viewer"
+HOMEPAGE="http://www.greenwoodsoftware.com/less/"
+SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
+
+LICENSE="|| ( GPL-3 BSD-2 )"
+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"
+IUSE="pcre unicode"
+
+DEPEND=">=app-misc/editor-wrapper-3
+	>=sys-libs/ncurses-5.2:0=
+	pcre? ( dev-libs/libpcre2 )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
+	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
+	local myeconfargs=(
+		--with-regex=$(usex pcre pcre2 posix)
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	newbin "${FILESDIR}"/lesspipe-r1.sh lesspipe
+	newenvd "${FILESDIR}"/less.envd 70less
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
+		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
+		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
+		elog "Colorization support has been dropped.  If you want that, check out"
+		elog "the new app-text/lesspipe package."
+	fi
+}
diff --git a/sys-apps/linux-misc-apps/Manifest b/sys-apps/linux-misc-apps/Manifest
index 629e632742fd..c6d47bdc60e4 100644
--- a/sys-apps/linux-misc-apps/Manifest
+++ b/sys-apps/linux-misc-apps/Manifest
@@ -1,5 +1,5 @@
 AUX freefall.confd 147 BLAKE2B b8fcd23306df7122e47e765dcba00cbec0fa7e2d9758d606e7e80cd3195b3fb7bce976fafef801812b425827f99689cde668106430119fcb57767bc816de635f SHA512 556472ab75ab8d3ccbedc44902a34bdef433430aa86fe5d8a125b27101f81e9c7c77e5a1fdfa84aef35078046e4b27a33eeb17d1745871f9e1f41e0ef64b2ba9
 AUX freefall.initd 1111 BLAKE2B c9c5de16da61124a4e984b47ca7cfa368cb5d02bfa85286f2cb9eaa50557da1b55d86b7a5beba5a5db60653c4a84b57276edc982782b7f8509d9a33cf45956e9 SHA512 e4d4d724276d9b64b80b29be5c28b9efc15556dd31545c85e45253aec2305d37af4b60a0be3f2f279c76c27aba5a968053a9bab7d08f2d559277701fd84375f4
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
-EBUILD linux-misc-apps-5.8.ebuild 6549 BLAKE2B 78a64a38d309a03b77b940928f8c22f951ecac56d2535b7a91b049088887677145603847f570cb4608b8080c486857dffa88df84a6b8140969ff769946d66e06 SHA512 f8ac675fecbcbe82b3cdb50add4a055666e7214292eccd80fe48a92c613b37f3922924cb11bb2a7b6c466ac41963be7bf1544d8601d5120cdcad218991de0a22
+EBUILD linux-misc-apps-5.8.ebuild 6542 BLAKE2B 3fc4c24460611e65d8b72bfd51a7a671f3e06cbf946e043278528ef90975028fa721ecfa10dd6ef036fdbc2a949bc489e053dc171dfc987ab68a29c23ab8824a SHA512 07a6b499ca3164a73a496dcebc5e2bb2871f2725a83ab133e4ff98bf324334222c6efeb03d3f89dd1785958cc54f957148761d0e3c9a832b95d1496bc9bf5f99
 MISC metadata.xml 318 BLAKE2B 87a15c795438a1025ba5624d0c00bfc1e3de3172205b20a4cdb27d5a0d524bc35d1aeb64e58b8c5fadd08d151a82913c35454c36ee5e653da86a6031ab707d24 SHA512 c5b90254b92fd0bd40596718daed1e9b5fd2c0039a814932811e33fb6827eac660aadd324bd45117d60ca56148b2f8213a075be1b255d6e8c006e2702f76833d
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild
index 2ad060b5c34c..b6ac148f3e6c 100644
--- a/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild
+++ b/sys-apps/linux-misc-apps/linux-misc-apps-5.8.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
 
-inherit eutils toolchain-funcs linux-info autotools flag-o-matic
+inherit toolchain-funcs linux-info autotools flag-o-matic
 
 DESCRIPTION="Misc tools bundled with kernel sources"
 HOMEPAGE="https://kernel.org/"
@@ -108,7 +108,7 @@ src_unpack() {
 
 src_prepare() {
 	if [[ -n ${LINUX_PATCH} ]]; then
-		epatch "${DISTDIR}"/${LINUX_PATCH}
+		eapply "${DISTDIR}"/${LINUX_PATCH}
 	fi
 
 	pushd tools/usb/usbip/ >/dev/null &&
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 7faf601a2171..d0d8e89c9193 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,5 +1,5 @@
 DIST osinfo-db-20200529.tar.xz 104668 BLAKE2B cb5b980cfc7753ad76aeb80d79108b125c3f1d3bec8a8878d2e562ce6b11b4369b8f9b0a03f5720ad58aa09abe8e140633652f19a4dc6f40e941e626d918e4aa SHA512 27efed4680d80432541c9e3dc692a381b479811ebce39e9b42382bd8b499d2782b59323a6c29517f38fa63061720d26c87e3c7ca806414adddfb9e4294ee106b
 DIST osinfo-db-20201015.tar.xz 108840 BLAKE2B cbda3fc868e2bd0f240d86dde70b04aa85ab869d6d8275426b60ca6ec63da3738da48b78540d5b4426e4aaea600d7ceb29d698618500fa1f45d6b2a1c3ddf5a4 SHA512 0c75ba6a3410af7e59e5696fff2883dd2285d9beb1eaaed90f12e78f05ad0e3f54352eb30ebfab2a4c4fa19c5c86c83b55931acdf04b25eeb015b19d64f824e6
 EBUILD osinfo-db-20200529.ebuild 668 BLAKE2B 5bd9f45c5745d97052e35df92fd9a6d7dd413816f28112c7574f310e792e905ab0b64f8198e968435d9c48c2d3b599edd0a9bf220be99f073ce7669042e9c79b SHA512 27ba85e90d6ec6079ef998b26cf86263345944644b93d86411e029ad8366b3e4570e349abe7579c27c31e5b4200f1b5885ce6dd9ccb7dc46701590b35571990e
-EBUILD osinfo-db-20201015.ebuild 649 BLAKE2B 3487966901dc92f12a1332dac19a801db50dee67e90c328f024c516b382e845cabc612a6916bde949d78d5623d26b013916acd9b558f84cc068f213612af7bcd SHA512 56033e88c8feb40e6cf5c091c567876193dbbcf8f46da120383326bc495d46f734b983025e7d93ff856d7bd57836877fa4f1ff32c3adc8a27106ee578d89c032
+EBUILD osinfo-db-20201015.ebuild 648 BLAKE2B 4cf67103c1a97853fd2eeb9e58f49b718abec82fb7f5aece511568412ebd97efa8b733f7f51dbebde7ea511e668919cf557f30caaf4da27434031eafcb60ce53 SHA512 f9d2541ab25a1a1ae08fdc7c4e74244cc6c1af22c5c17b15159e68542988f6595bcd6e81c00c7414fb96c598257258d6c969c63a69452bafa1ec3b6f16b0dd25
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20201015.ebuild b/sys-apps/osinfo-db/osinfo-db-20201015.ebuild
index ed7983337440..82eb2b072ac4 100644
--- a/sys-apps/osinfo-db/osinfo-db-20201015.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20201015.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 @@ S="${WORKDIR}"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 BDEPEND="sys-apps/osinfo-db-tools"
 
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 2c6283b7d777..0a980a45bb97 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -3,10 +3,8 @@ AUX 99-pcscd-hotplug.rules 358 BLAKE2B 6ff034ffd1a1942d5d0429f9ed35428853ff8daa0
 AUX pcsc-lite-1.8.11-polkit-pcscd.patch 744 BLAKE2B b9a846a989d1708a30bb62e93ab19fbf5cfe4c2c601d435b53a8933117d919a4fbac8835e68b895507840a25a9aab85e35f6b4c2e7461ec3c7893d483e12f759 SHA512 4f8b774ec888d51c0ad82431cb9d041be6b69af0bfa2a535c6b7e47afb0056147c08ab9265d7da2259a74347ceba9dba320ad0892d3a25797efc64b79113f4a5
 AUX pcscd-init.7 408 BLAKE2B 54e4995a169b7f816b0de9b409ae94a8328e792b50872d583988cc87ad20b5c2d20559f3702dc4525dcc46c4afabf817c1e76f4a080ca277f9ab01ebcf67441f SHA512 24fbd0fe2847f6c7bb961e4e0d9fa5197d408971fc33fa7652893ce9dbba958d19b02be7688afd4e9617520f93b6544af74968d6fcc3b31ad73b3ac585e87500
 AUX pcscd-udev 330 BLAKE2B 50e99953aec238fe98c6aee5219d3978b44d37c90ce74c9cb8e19b37c8677001e9b1b3701df8246bf051c6cf8b5c971f86bf1f580bfcbff270b8937328ca887d SHA512 06b672135fda9f83af4f030ff8078f8e1194ced529334c17c1a93f81ee9a5d4448bcea5ffec398f01d957a6607fbde7f69fbc23d727bb3ffad48a305cefe5c26
-DIST pcsc-lite-1.8.25.tar.bz2 757099 BLAKE2B c34727833206b4c868e4f0cd6f8bcaf6899695a92488df8e2fc815c00771ea2f248d9d5fa457c02fc437b8350cbfa37390e07f45b90d08630c8afc34b247034a SHA512 0da63cefd70d9524b2afabd62c5f404758c805b84bbe9ef64fb801ef91a8934c38495513022565ea31bd8550b23bc95b9e9b098ddc76930e3d0643c1fbfb5deb
-DIST pcsc-lite-1.8.26.tar.bz2 754838 BLAKE2B 98bc1abdd66a08dde479821f8b1ef489980a6d58d2a624902de12d0862a4e11b47ed7b12eceff438ecd794bd78a91a7a376e7f4c78c1b03867555dd0e5b734d5 SHA512 23f9f41e08f6a5ff1840bec621ee37d6eb268e4ced58df516eb7e32cb6a84998a1d04bafcec36e6524926963e6730a25301301d364b6bd4dda8da1caaa76f037
 DIST pcsc-lite-1.9.0.tar.bz2 755963 BLAKE2B 30d027ac61aba1f57224c88ffc4ec8568dcc2747f3f7e24be07e7ce52bd23ad7a71b6a2f78d912f827a4c02a22c13ff16bc1450c02bafd92bc87ac0e34a2bbcb SHA512 35c85b15ab54c14403a080d6671b3d986910372651d46a5477111172d42c6d2cf58f4a3ce95427e7a84f6b4d3bee30ea57bf69b855f753160a3c6e72f93e34f3
-EBUILD pcsc-lite-1.8.25-r1.ebuild 3065 BLAKE2B 690de2160a8931befb9f133a185684c2d0eddbbac8bb37f765adba2baf3a7e9c087af1a3482e468ca874e5b318dd174afec0c41a01c3e1eb6c43879bf8511373 SHA512 c19e664f54d662fcaec28723ab2e48f3ba35e31c004951462a92d44a1a86e5a595bb64f8983e141b3bd8cc77792ba68b95d8cfcd2d60c69aaff9e546d7c76509
-EBUILD pcsc-lite-1.8.26.ebuild 3165 BLAKE2B f0ea2112dad7e9f1541484663f44e805c4a61b03b3030df9fa661b92445b5de4785a591d0ba980a359483cfba3f253146793e76de842e822e2efeaa6951b3fc5 SHA512 547d29a953857ff692b8de2a5e9211daebe222d3ac7e9b842340c5d244e28333c70a5d00533450f898240425ae83c929660c559e70d3f6a248de286297b50e56
-EBUILD pcsc-lite-1.9.0.ebuild 3169 BLAKE2B de0557416a662d85815cb365126fcdcd29c412a8366e62e31dd592a44b885284d453579c75b859dd2139071684104e629cfddfb44b9e3f6c9ed42ea9e6df245d SHA512 7033616187d1d2df2c4caaf267d0fa19098ba14c5ccca965403db91cca8e09e6e2b50e4bdf3d3dad06c92ff0f9f2f6067bcf292c9963b75dc709cf4e5858436f
-MISC metadata.xml 1078 BLAKE2B b47112f9457ca29308517a6cbac1502a83bb8c3ac19f95db1788d0695808c07e3cd1955cbe0ea2f861e6cd9a78cab793f9fbeb699ffb0952d1fa4c3372b8ead9 SHA512 b1804b8e9ec6044221e4158a0127e1dfeb2381d264383f3ba4faa69d6a6ac8a1bd0fcf7681dec92ef7105c05463191bb6e890962bbf419f839d47d51f1d8f7d2
+DIST pcsc-lite-1.9.1.tar.bz2 763525 BLAKE2B b85364f5e2a92450b020bfc28439774c6a6ffb9016ea4072d1925fbc1cef76cd370b298c0b414ba322205d859018308bd7101ef89c5b6f96b97e4f223035ac35 SHA512 4f59ea6acb5b258092018f10609987e12b8e601049e6ffed4b4b82abd3c4b35c38a60e1cda28fdc884202e694d1bc3a3b5d930c5b1e9c1b9c309bd17ef463e63
+EBUILD pcsc-lite-1.9.0.ebuild 3167 BLAKE2B 9172b138a531936e2de9bd0d9d961d252f88d57950ae414b6ea3816f0d25f60406ede13d3d1e17159bf33681d7294526e9778f42a10292aaf846a70c6978c208 SHA512 baacae6682f43ce2ab5d89c5e278d11cc9cc5420d14821bbaa7b03e000884953d9aa1cda9df634d090444ba16af9fb7e2ed7e12d5b6d568ab4808960f5ee16da
+EBUILD pcsc-lite-1.9.1.ebuild 3174 BLAKE2B 64e94f5bd9b187888f472209d9427d743bc217f3ee22b2000d80f4ad725e3a1a6e2dfd058ec242f9e79454a380b03ef9079a2e4d6d2bd75fc02b1d8f5ac07dad SHA512 28a35ec3d2478c9d4c356ee7e24c4ca0aefcc6e69781196b817ac9eb5a47fea14c1b4045b7b9b4d8b67621e4e93cd1e0f4788dfa3002ba6906231d6f1e1e1640
+MISC metadata.xml 1082 BLAKE2B 2a17c8ba7222cbaa7f85fe736c81e8acf5516d35493c5c288f490ea6718eb7734856c12cf856ccf7963d142843fc354f38e265a0324f66aa44647071a252770e SHA512 3538f225dd27a1fee2f02a2ed7c656534f5445cf3c54f453571aa87246c84016cae556e3b683a0f34fc4434f1a0eb8b7855bf872a8ca1989a8c871767e565b0c
diff --git a/sys-apps/pcsc-lite/metadata.xml b/sys-apps/pcsc-lite/metadata.xml
index 37710202e74b..0ee326b46fb0 100644
--- a/sys-apps/pcsc-lite/metadata.xml
+++ b/sys-apps/pcsc-lite/metadata.xml
@@ -15,7 +15,7 @@
     </flag>
 
     <flag name="udev">
-      Use <pkg>sys-fs/udev</pkg> rules to handle devices' permissions
+      Use <pkg>virtual/libudev</pkg> 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.
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
deleted file mode 100644
index c2be306eb846..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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} )
-
-inherit python-single-r1 systemd udev multilib-minimal
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
-
-SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
-
-# GPL-2 is there for the init script; everything else comes from
-# upstream.
-LICENSE="BSD ISC MIT GPL-3+ GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# This 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="libusb policykit selinux systemd +udev"
-
-REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
-
-# No dependencies need the MULTILIB_DEPS because the libraries are actually
-# standalone, the deps are only needed for the daemon itself.
-DEPEND="libusb? ( virtual/libusb:1 )
-	udev? ( virtual/udev )
-	policykit? ( >=sys-auth/polkit-0.111 )
-	acct-group/openct
-	acct-group/pcscd
-	acct-user/pcscd
-	${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-pcscd )"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
-)
-
-DOCS=( AUTHORS HELP README SECURITY ChangeLog )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-maintainer-mode \
-		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
-		--enable-ipcdir=/run/pcscd \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(multilib_native_use_enable systemd  libsystemd) \
-		$(multilib_native_use_enable udev libudev) \
-		$(multilib_native_use_enable libusb) \
-		$(multilib_native_use_enable policykit polkit)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	newinitd "${FILESDIR}"/pcscd-init.7 pcscd
-
-	if use udev; then
-		exeinto "$(get_udevdir)"
-		newexe "${FILESDIR}"/pcscd-udev pcscd.sh
-
-		insinto "$(get_udevdir)"/rules.d
-		newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
-	fi
-
-	python_fix_shebang "${ED}"/usr/bin/pcsc-spy
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
-	elog "the pcscd group, to avoid running as root."
-	elog ""
-	elog "This also means you need the newest drivers available so that the"
-	elog "devices get the proper owner."
-	elog ""
-	elog "Furthermore, a conf.d file is no longer installed by default, as"
-	elog "the default configuration does not require one. If you need to"
-	elog "pass further options to pcscd, create a file and set the"
-	elog "EXTRA_OPTS variable."
-	elog ""
-	if use udev; then
-		elog "Hotplug support is provided by udev rules."
-		elog "When using OpenRC you additionally need to tell it to hotplug"
-		elog "pcscd by setting this variable in /etc/rc.conf:"
-		elog ""
-		elog "    rc_hotplug=\"pcscd\""
-	fi
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild
index 268a60b0bc60..5d6b8904ec10 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # This 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
@@ -28,7 +28,7 @@ REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
 # No dependencies need the MULTILIB_DEPS because the libraries are actually
 # standalone, the deps are only needed for the daemon itself.
 DEPEND="libusb? ( virtual/libusb:1 )
-	udev? ( virtual/udev )
+	udev? ( virtual/libudev:= )
 	policykit? ( >=sys-auth/polkit-0.111 )
 	acct-group/openct
 	acct-group/pcscd
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.1.ebuild
index ec7386ccf059..1d51c5e54861 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
 
 inherit python-single-r1 systemd udev multilib-minimal
 
@@ -28,7 +28,7 @@ REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
 # No dependencies need the MULTILIB_DEPS because the libraries are actually
 # standalone, the deps are only needed for the daemon itself.
 DEPEND="libusb? ( virtual/libusb:1 )
-	udev? ( virtual/udev )
+	udev? ( virtual/libudev:= )
 	policykit? ( >=sys-auth/polkit-0.111 )
 	acct-group/openct
 	acct-group/pcscd
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index b4d2cb6d853a..f805a70c377a 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -5,12 +5,14 @@ DIST pkgcore-0.11.0.tar.gz 641831 BLAKE2B 93b2d680b0daa6611ee4fe3782e90736950859
 DIST pkgcore-0.11.1.tar.gz 642312 BLAKE2B 70aac2357af1d84f3d7372f09483b9b1ba46dec9cb20044c540e482a1161c1419d8dfd5383aa12731679f05c5fe2f98981317eecd32059301ca757982f8b1ea2 SHA512 572137175f9af3cc451f412ead5d67d5fe79826d56f773dc5b6cc791cdfe575d6cab82c2943afe705c759edd89cba1282092d772f46343c8452b52d344bd2ff0
 DIST pkgcore-0.11.2.tar.gz 641792 BLAKE2B 295cc8302badcae333939d69329331be5f76d965549c75140ce809d693cf688fe3d3152c44a9d738aa2d90ed1c9f4aad2cf3c9a9a3a52a067e69cf7dd6c87b96 SHA512 602e7ad03699b3b3f302d6d414a9587f1c7829be83898e055e8e1a46e2a805b535cb715bbbb4d43100f77b8b119e13e8b1e374f45be879b4c9dfe02340f225d6
 DIST pkgcore-0.11.3.tar.gz 641848 BLAKE2B 7a1ff52e9f41b15ec3c211b99ac8666ac16ca1ca40168cce15aba42f3dea6c030623ef4e4ad837297dca860a70396743842467b0ff7305bbc5d3d640d1f2918b SHA512 2d7e4d3228c6ec3bf5aa5cbf8d4235d1b1c0b10c2f4f50c48c84948c68fe1f277eca8effc2bc1310cef2e5227143acb96775c4a0288ab94757de23437f57a084
+DIST pkgcore-0.11.4.tar.gz 643951 BLAKE2B 79567cdf5719b090ec358b51a7482f01a77658728efe267ca5bb217512004f920864f101cc59bdc2ce6f7260a3abc896b2cf4ef168f77500d541c92bfa848f4e SHA512 f290efacc13b72f6bf2319e240b2fba30a1307e6673db2f653dcc6a21420e94928deb63aa0483d9ac632791e60246758fe1de0481316b222c0b60197047dfb10
 EBUILD pkgcore-0.10.13-r1.ebuild 1146 BLAKE2B 023679ec203e7e1454e6bb6d91c3408b8e819e002ceb42efa71832a77ab306c11b5efb54a0f76cd90b14873c55a55d9451e064d6ec1bcd124aaab351d63133c8 SHA512 66c437ae8d726cae98c63daf13e8ac92e9bd8add181ca1a737643e688c33bbe02fc3bfc0008eab1d6b2988eebc61dae98aaebf026dded376713257801b7dd5a2
 EBUILD pkgcore-0.10.14-r1.ebuild 1094 BLAKE2B 4f34fa4e80c1bb45f6a65e4cc49710ee286d5689df1dd1620d5db6ec70cde9afee34624d92ced2c1c1f1ea141fa86f4f138f43bc713ba8a4e00a1d87dcc7ee0e SHA512 028b1458b694f4808cbcac91db41a29613c7bbfea235f67e388b9a4e4c86f982e9c65d2d09107e99e9e2c2ada4b1c120dc5aeacb6032e8898ab69e0cfc4f0838
 EBUILD pkgcore-0.10.14.ebuild 1091 BLAKE2B 557b9c192ec28b39a0eb043fa653763900b9de64ca1bcdbb13772d39dbf14177640225c14c97041b7349bd8a39f5b5af9c52f2900d78ade100e6b3f6b3854c02 SHA512 fe7158312fbc934482838af4af6149d66a4d43d806e4504a203b0d1dcf59e3dbf5c86ac3ede2698a2e51d73873e8d7c75114bdf07962a365aa57db910b1e762f
 EBUILD pkgcore-0.11.0.ebuild 1003 BLAKE2B 6ef0f5b2ab8a77e1d8f44ce07bf4a2105a1643d121032b56d00161a80eaeef580fe24dcb71ec2f9fd757f2adb365f370a116f5684ea8200a5727f8efa20689f5 SHA512 d20617349e2095443b0d749f3c67d9c5db88a43ef47cb4d6ad7bc28f19a96fb5758a47cc21ba00eb6f4474b27bb579618a1b4cbd7d2febe9c8590a51a9fe9af3
 EBUILD pkgcore-0.11.1.ebuild 1003 BLAKE2B 6ef0f5b2ab8a77e1d8f44ce07bf4a2105a1643d121032b56d00161a80eaeef580fe24dcb71ec2f9fd757f2adb365f370a116f5684ea8200a5727f8efa20689f5 SHA512 d20617349e2095443b0d749f3c67d9c5db88a43ef47cb4d6ad7bc28f19a96fb5758a47cc21ba00eb6f4474b27bb579618a1b4cbd7d2febe9c8590a51a9fe9af3
-EBUILD pkgcore-0.11.2.ebuild 1000 BLAKE2B 8ec581d5b76501134134b92713c915052cbb3e647e53b4a896e661ee066d26b0c89e86fb1cafbe7eda7437c7e9afff4d422e3e137e0fca1d164e3dca136099ba SHA512 c955d33b6e522d1e7eda040fac1b19f1c54a8ccb5ed7efe7aba13f05834b57dcbd1ba8d1abcdaf5d0fa497e165001849e90908da0eaf5a64f7ec13fb830f38b6
+EBUILD pkgcore-0.11.2.ebuild 997 BLAKE2B 3a339f210ac956f187fa330e33b704846acea863a77d74a0276cff62d35aca232454d255c0a383e3abb7071b1d88cba7793d05fca45197648a6fae938394d61e SHA512 7250338d678ab5b23bd5da15a63fbbbaa0fdc5d1735dd3c44c3180a6f8ff1f8a554ebeb22d1e8f17f15d80ad7d345c52cf5c2b89ae259612fa368abf006abb7f
 EBUILD pkgcore-0.11.3.ebuild 1003 BLAKE2B 440fcc183d493bd314c048a1e926cde74cd772ed254646daf33a57a474544afda4eb4c38c74eaa94762364353b40c2b87ed677f0ba9c55bfb50b40d42f7c5dd3 SHA512 ae46dba3188594c895433b9e4547a2964841aca78498e7e916d75f86c81dfab1fb5e9055e7c567c72df6b07ce51122a3ab79d478e177ad3fd2bf080a004997ab
-EBUILD pkgcore-9999.ebuild 1003 BLAKE2B 6ef0f5b2ab8a77e1d8f44ce07bf4a2105a1643d121032b56d00161a80eaeef580fe24dcb71ec2f9fd757f2adb365f370a116f5684ea8200a5727f8efa20689f5 SHA512 d20617349e2095443b0d749f3c67d9c5db88a43ef47cb4d6ad7bc28f19a96fb5758a47cc21ba00eb6f4474b27bb579618a1b4cbd7d2febe9c8590a51a9fe9af3
+EBUILD pkgcore-0.11.4.ebuild 1077 BLAKE2B fbb8f0e723f5eb441cae9b8f0dacf1d6775a086efdb318b3683c35009ce868d2f4ed659cc24f92a875370e189a849e01dd4a2b7a6c45f8bed512c852942ea6f9 SHA512 432b04443a50ea90234f8c163bdd918187dbdcaab3b92a74131b850ada15423aa8339230769fc1e5a40f512bcd69a1ba20bcc8820afd87125b64c46daa4d55cb
+EBUILD pkgcore-9999.ebuild 1077 BLAKE2B fbb8f0e723f5eb441cae9b8f0dacf1d6775a086efdb318b3683c35009ce868d2f4ed659cc24f92a875370e189a849e01dd4a2b7a6c45f8bed512c852942ea6f9 SHA512 432b04443a50ea90234f8c163bdd918187dbdcaab3b92a74131b850ada15423aa8339230769fc1e5a40f512bcd69a1ba20bcc8820afd87125b64c46daa4d55cb
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/pkgcore-0.11.2.ebuild b/sys-apps/pkgcore/pkgcore-0.11.2.ebuild
index 998771367940..42c6a3cacd81 100644
--- a/sys-apps/pkgcore/pkgcore-0.11.2.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.11.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/pkgcore/pkgcore-0.11.4.ebuild b/sys-apps/pkgcore/pkgcore-0.11.4.ebuild
new file mode 100644
index 000000000000..d98868c1bf84
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.11.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+=" >=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]"
+fi
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests setup.py
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 2998f6377a3f..d98868c1bf84 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -24,7 +24,7 @@ RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]"
+	RDEPEND+=" >=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]"
 fi
 BDEPEND="
 	test? (
@@ -35,6 +35,11 @@ BDEPEND="
 
 distutils_enable_tests setup.py
 
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
 python_install_all() {
 	local DOCS=( NEWS.rst )
 	[[ ${PV} == *9999 ]] || doman man/*
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f6f5700a9673..1b18142c1a6f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -4,16 +4,14 @@ DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90
 DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
 DIST portage-3.0.12.tar.bz2 1049335 BLAKE2B 9f7b17ebfe068559ffbc2bc0799f72901abab8b8b5bb608c8f6afe1f8f7fdaae1026c2a04d9b2256b367711196e32b58c6927ea6fc57146148ed71b295acdcb8 SHA512 6f93f35c06ac765f926f5281e2fac99d52140e8c5d95ee4224796c1ea23ed5f45ed5382acbbfc7aebf9f68a9c585fc1b41b615ef765be2d16577909032de1350
 DIST portage-3.0.13.tar.bz2 1049930 BLAKE2B 092e4a25896d613dcfcdaaa1c75f29d19112688328c4078a8ab2b24edcf1e26fff3273da56a79f8b35aada5e11e3cf7f14ef40aca742da0874ea7e907c4778bc SHA512 a9106fce311053523fd026c6c65cb85562bae69ab6ea6b5ae784044ffedbfeb0e3b1c3758ebea9204b11f885da383f9d8ee31d34ad52ac14f059cf97894e3590
-DIST portage-3.0.14.tar.bz2 1049983 BLAKE2B 174fe1f14bf1cabbe044724bab5eeada6e4d86be7ffd00db1dfe97568dca450aa44856ef7c241e7ed194f99aecb6f8bcffaf30e428c17e53d4afd4265543b495 SHA512 796f34922abe8dcc0deb687c7b42644bc82fedf8751eeb97ef26355dcd600cd134809abcc71c3bdfc233e1c15511c13cbb06c66b5889f47f2b2f51d5384d5888
-DIST portage-3.0.15-bug-772386-fetch-48226b2df140.patch 1432 BLAKE2B 37fa0521566a15eb6c137cb8c6c877782015a2b9e4999b257a3467d58790dede07496ed94f2c49a76d09bdaf2e80b6344fd3a3229ca9cd31102b26a9a988376e SHA512 65dd8c94edb4320c88d534f9e6bcf3cf553086fb6441ee01a917d2645f564bcb6d1b86ba60e6ac3059c28722dac0391856a223a0c8e03103078e5acbbb895bc1
-DIST portage-3.0.15-bug-772386-fetch.patch 1283 BLAKE2B e2a3f554e13ab70d0efa376fe9adc3820da08c82aea092bef7571b3c9f3f23640b39a9f3aa6bc0cc2a10eb3c636ce2cf0523ccfcd9d03cb2bac942de5d55044b SHA512 58e4b14441e6093da5cc49c7894173164897938c1445b3fed23f5cc81d1c8601f427e4b8f6a918ffaae06dfdeafc9bc1bb3c71ec846c497630abe9b942b44e12
-DIST portage-3.0.15.tar.bz2 1052590 BLAKE2B 144a80241300952075f884da570e90736f1a8b40067bcc7aac0740dd3be7b3574f4fb9de4471aca201d99b95ce0eb3202d94bc2489caef8e74e9db73ab229eff SHA512 588e4c0ca2f8155e141faa96fb10155f554ea68dd5bf426aa3c15db333317e7a6535cce4fdea0b273f90b72cbf0bfc9a28fdb776ed57244bbe13da49f46b3491
 DIST portage-3.0.16.tar.bz2 1055482 BLAKE2B 84d1ffd0be8855a7fee5b966d72032e59d72184dabab99c97bd829c669ac8eb526470c7b05958c9ea4cce4236bfb4998167db8feed74f8ef879d1e529c3d0eb5 SHA512 ae8ca1d15143bc0b62506d46b042626dc3d8587110c909448cb3735080a4c916d5d6d4bcaa4f189f98a32b0de29f2fc8b643f38642ec26fab58d1448ac50f1c3
-EBUILD portage-2.3.99-r2.ebuild 8472 BLAKE2B fc3cbd3cbb80a6590cfd461e4895029069b48e941842d64c46ece7c55c2be68da8a7a302e79f4c882f365987e92cce608b67b3a10c6630297130f7e92c21d456 SHA512 d6b8f093ea2b6006cc3c7b71fc3585c160332014243707ef3c03f75d98190c10e22fcbaf963aee2537675cdbbe9af2a2453affabe973b28df8b0a6d80c9bf694
-EBUILD portage-3.0.12.ebuild 8420 BLAKE2B 800633bf0fd26fe14f4e47e88a5a73478790a59968e8f35884e269b98747589b7d603cfe1f2e703b2a5ef86f9e797ee46af4892aa873b52cbc748933ec3a3c99 SHA512 9a65e037896df9ad6b1a359f26bbae7514cc7a8333c04eb153ffe24d4414f0ae8b4431fe8a5cc7dc29758bb3b702f771681b05ca7ec4ecbcf2e3864b8e8bd53b
-EBUILD portage-3.0.13.ebuild 8420 BLAKE2B 800633bf0fd26fe14f4e47e88a5a73478790a59968e8f35884e269b98747589b7d603cfe1f2e703b2a5ef86f9e797ee46af4892aa873b52cbc748933ec3a3c99 SHA512 9a65e037896df9ad6b1a359f26bbae7514cc7a8333c04eb153ffe24d4414f0ae8b4431fe8a5cc7dc29758bb3b702f771681b05ca7ec4ecbcf2e3864b8e8bd53b
-EBUILD portage-3.0.14.ebuild 8429 BLAKE2B 769f0513e4c1523f128351092bdeb08c0bc974e38121f3a7b39576445f03297523e3072605c77a6dbfe19933077b5bbb82266d3040c40ab2929863f8dd8dcff2 SHA512 c6f369df50cb097f80e44d9c6792cc43f40371cdc45804227b0386b51982fadb2a2c671345a2421444ef74d281ecd3e7535de36c6089116984f8303d7daa1eaa
-EBUILD portage-3.0.15-r2.ebuild 8792 BLAKE2B 86233ecf18468b3e474bb19c768ec4a17fa88fd3d6daadb248dbc8398afafb0397df8d25664910bd528a4ed0324387b1da10481420cf11e1d3542f399f3d5145 SHA512 8ee2df75d1ca1bd25a89df48bdb1c78b39bd7b5ca139ac342b7b26c6a5f274226989a0d91bb19a89308f3b965b6d7522e260af5ac9e100db134208ed7d655185
-EBUILD portage-3.0.16.ebuild 8604 BLAKE2B 1c5432568f2072c27fbb335a7f0db6602d3b173827a986101d8d1776ff68e02626c30509490b1facd212a4375e060446dde25350d65a7729ba91bb1e1d8bfc89 SHA512 be1425c6b9a0a0b37c861c89a12780e0c3bd2f349d0f6cea4bfc907dabf516cf5cba5e5788ff05f77139e3ed5c0ce7f9bdcfb52fc03eece864367976c44f0e0b
-EBUILD portage-9999.ebuild 7635 BLAKE2B 420719610f41fad605e3c66480f7c38729d4ddcde63543a21bfe596e36ce1fb11de479bef7c33e0d4dab69048dffbfc7425905b7e1671b573ec438889cff7ac8 SHA512 788af0dad2f48a19bf9baf01eab81059fb0aa1e8168f3266af7315f62c6a743031ee21c20320be1cd8d93096c837a499c518860cacd19c5c38e972964a419173
+DIST portage-3.0.17-bug-775053-setup-globals-double-prefix-ff7d78.patch 908 BLAKE2B 51984f04bf9a9b448207f9f724a01e72f76a1df8f3da8a9cf263a870674458e885ed47aba7597b3a01d9ee3c86b687bcb9048356af9d7d2b015dac9c41c97baa SHA512 1aef52afcf4e5dca3afe7d746a868f5ea5a1afb28703e2087d620f5206cebdbf71e0d600d3354693e59f49cd92758f47e3aafb4625539af0cdec80b36109051b
+DIST portage-3.0.17-bug-775239-_test_lock_fn-tempfile-leak-d8a12c.patch 733 BLAKE2B 8281107d270908b49218603ef64b7580c5d6e0bf015eabef4c35f8ee9d76b2b7790f4b75404b9d85fd030c3a0f9183e88894d67bf547978f3fa0bed0630112cf SHA512 5ea4ccc7d517ea79a02fad77d20502d613cedf9df00edebf73972979bd5a469f47c14ae5b69b850f0ce9860b9fdf1b5bb283e138bd7be5b832928697e4bba42b
+DIST portage-3.0.17.tar.xz 970076 BLAKE2B 261d8d3b0da5bb77f37328219365a59d7ac56a22e887de59a6b702fcf895493f7a0aac1af744bc67b80c9e2aa730795e507764e9e1c807c247d1ccbe6f825d2f SHA512 6f4a50b005a67e6eea24600d10179fd48b4aa1de4cdf99bc310854dc303248408f8a31bca4135e4e530fcbd2b3d99c2f89644e4e4240e3a754fd97e949403ffc
+EBUILD portage-2.3.99-r2.ebuild 8492 BLAKE2B f7b8dc5945641519b9a13bf149b172889261f89df30f1878632a4b3b2e84db8bfc5e329a77240afdfd4b4c529928724074fe0d63d8ad282aa3804c9c18d5194c SHA512 b8dc26ab536c251b2be914c8a212c1b92d4832835a058b507d47a94b4f8e5f68410d1c0a2c164c44359219fa9859237ba2a83ac209bff0a6e9fe824f7b7f4e7c
+EBUILD portage-3.0.12.ebuild 8440 BLAKE2B fddb332ecbd05f0db76eafd58c79e3e9f4b0b1637a2f604d928113a7e53db7db714f23582ee498a052ab93b07b50972c20621e7f79d249cfcb1473ddd02c9c58 SHA512 f6a2710b49f5c6e29e105ca72629d8f707eba0f44aead8a8a47d4a0f2bfb095802492c48d51f4e5941974f2d6e51e9eecfebcc031c0d5ba6db7619d636d4a2f4
+EBUILD portage-3.0.13.ebuild 8440 BLAKE2B fddb332ecbd05f0db76eafd58c79e3e9f4b0b1637a2f604d928113a7e53db7db714f23582ee498a052ab93b07b50972c20621e7f79d249cfcb1473ddd02c9c58 SHA512 f6a2710b49f5c6e29e105ca72629d8f707eba0f44aead8a8a47d4a0f2bfb095802492c48d51f4e5941974f2d6e51e9eecfebcc031c0d5ba6db7619d636d4a2f4
+EBUILD portage-3.0.16.ebuild 8745 BLAKE2B 20ce435f757cc791953f8b0ab80162a14c85b508fe6ed03923c4c5712cb69173a311733026c81c975c14b16a5f64d90f27cfc6aff9cf296bcf2672ead626b696 SHA512 28917107a1f07420449a390b17bc51438962c4dcb8a4c65e4e9fc9f8ee06d8046b384604878c2a07d7c09d2c9d91871a52d818a31fa3492672fe5328eedddc5a
+EBUILD portage-3.0.17-r2.ebuild 9217 BLAKE2B a21d203010e110b5929b1e7945c8dbed07273b76746ee1ed5981acc77ebaab5f5c94afcff1af137082debed5a2f6123b89b557197411a551151b4127917fda08 SHA512 b2d86b3c56815d3b88d23b8400c130c5b006ccc806920d75f384f1bccd21a91a82e7df9d05a6ce5d506e75eddd92746d244ffe677b6f6de6f2f7c886eb9c42ee
+EBUILD portage-9999.ebuild 7776 BLAKE2B bef58d44947c861ca20767e5204ce67b51f7b63a7209b13e2761a97dce73b60ea153cee09b44769501796dcf50bc45943f3b3631f6c80f22a6545aee75de303d SHA512 0049bfc2225ee65073f56e498237b2862a688d083fdb6976bfe983b5c02722254f656e6571eb71c159b3e7b9daf400e513dea87bdb4001dbb55d2976a14458b8
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
diff --git a/sys-apps/portage/portage-2.3.99-r2.ebuild b/sys-apps/portage/portage-2.3.99-r2.ebuild
index 3e8a16cd18dc..b0d41add84fb 100644
--- a/sys-apps/portage/portage-2.3.99-r2.ebuild
+++ b/sys-apps/portage/portage-2.3.99-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=5
@@ -6,6 +6,7 @@ EAPI=5
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_7 python3_8 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
 
 inherit distutils-r1 epatch linux-info tmpfiles prefix
 
diff --git a/sys-apps/portage/portage-3.0.12.ebuild b/sys-apps/portage/portage-3.0.12.ebuild
index 0c67947746ed..2ca4d26888a0 100644
--- a/sys-apps/portage/portage-3.0.12.ebuild
+++ b/sys-apps/portage/portage-3.0.12.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_{7..9} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
 
 inherit distutils-r1 linux-info tmpfiles prefix
 
diff --git a/sys-apps/portage/portage-3.0.13.ebuild b/sys-apps/portage/portage-3.0.13.ebuild
index 0c67947746ed..2ca4d26888a0 100644
--- a/sys-apps/portage/portage-3.0.13.ebuild
+++ b/sys-apps/portage/portage-3.0.13.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_{7..9} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
 
 inherit distutils-r1 linux-info tmpfiles prefix
 
diff --git a/sys-apps/portage/portage-3.0.14.ebuild b/sys-apps/portage/portage-3.0.14.ebuild
deleted file mode 100644
index 26f0e3f8e28b..000000000000
--- a/sys-apps/portage/portage-3.0.14.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 linux-info tmpfiles prefix
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-vcs/git )"
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	apidoc? (
-		dev-python/sphinx
-		dev-python/sphinx-epytext
-	)"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	acct-user/portage
-	app-arch/zstd
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/findutils-4.4
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		rsync-verify? (
-			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10
-	!~app-portage/repoman-3.0.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f ! -name etc-update -print0)
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use apidoc && targets+=( apidoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use apidoc && targets+=(
-		install_apidoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	dotmpfiles "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	python_setup
-	local sitedir=$(python_get_sitedir)
-	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-	env -u DISTDIR \
-		-u PORTAGE_OVERRIDE_EPREFIX \
-		-u PORTAGE_REPOSITORIES \
-		-u PORTDIR \
-		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-	env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
diff --git a/sys-apps/portage/portage-3.0.16.ebuild b/sys-apps/portage/portage-3.0.16.ebuild
index 0c20c5376262..4bcace7f5405 100644
--- a/sys-apps/portage/portage-3.0.16.ebuild
+++ b/sys-apps/portage/portage-3.0.16.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_{7..9} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
 
 inherit distutils-r1 linux-info tmpfiles prefix
 
@@ -137,13 +138,17 @@ python_prepare_all() {
 			-w "/_BINARY/" lib/portage/const.py
 
 		einfo "Prefixing shebangs ..."
+		> "${T}/shebangs" || die
 		while read -r -d $'\0' ; do
 			local shebang=$(head -n1 "$REPLY")
 			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
+				echo "${REPLY}" >> "${T}/shebangs" || die
 			fi
-		done < <(find . -type f ! -name etc-update -print0)
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
 
 		einfo "Adjusting make.globals, repos.conf and etc-update ..."
 		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
diff --git a/sys-apps/portage/portage-3.0.15-r2.ebuild b/sys-apps/portage/portage-3.0.17-r2.ebuild
index eb9abac2065d..2057b3611383 100644
--- a/sys-apps/portage/portage-3.0.15-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.17-r2.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_{7..9} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
 
 inherit distutils-r1 linux-info tmpfiles prefix
 
@@ -18,7 +19,9 @@ SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
 RESTRICT="!test? ( test )"
 
-BDEPEND="test? ( dev-vcs/git )"
+BDEPEND="
+	app-arch/xz-utils
+	test? ( dev-vcs/git )"
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
@@ -82,14 +85,14 @@ prefix_src_archives() {
 }
 
 TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	https://github.com/gentoo/portage/commit/3e5ef19d5d6b26fde08da463d730ff90edf6eb29.patch -> ${P}-bug-772386-fetch.patch
-	https://github.com/gentoo/portage/commit/48226b2df1408cf1944cb7c6128c73710c740dd3.patch -> ${P}-bug-772386-fetch-48226b2df140.patch"
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.xz
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.xz)
+	https://github.com/gentoo/portage/commit/ff7d78442895e53afb534c072477f98bada4f248.patch -> ${P}-bug-775053-setup-globals-double-prefix-ff7d78.patch
+	https://github.com/gentoo/portage/commit/d8a12c258cbe15b2725c51b1061e8297919b20df.patch -> ${P}-bug-775239-_test_lock_fn-tempfile-leak-d8a12c.patch"
 
 PATCHES=(
-	"${DISTDIR}/${P}-bug-772386-fetch.patch"
-	"${DISTDIR}/${P}-bug-772386-fetch-48226b2df140.patch"
+	"${DISTDIR}/${P}-bug-775053-setup-globals-double-prefix-ff7d78.patch"
+	"${DISTDIR}/${P}-bug-775239-_test_lock_fn-tempfile-leak-d8a12c.patch"
 )
 
 pkg_pretend() {
@@ -144,13 +147,17 @@ python_prepare_all() {
 			-w "/_BINARY/" lib/portage/const.py
 
 		einfo "Prefixing shebangs ..."
+		> "${T}/shebangs" || die
 		while read -r -d $'\0' ; do
 			local shebang=$(head -n1 "$REPLY")
 			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
+				echo "${REPLY}" >> "${T}/shebangs" || die
 			fi
-		done < <(find . -type f ! -name etc-update -print0)
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
 
 		einfo "Adjusting make.globals, repos.conf and etc-update ..."
 		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
@@ -254,6 +261,10 @@ pkg_preinst() {
 		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
 		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
 
+	env -u FEATURES -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+
 	# elog dir must exist to avoid logrotate error for bug #415911.
 	# This code runs in preinst in order to bypass the mapping of
 	# portage:portage to root:root which happens after src_install.
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index f229af539a23..90088d7a92e7 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_{7..9} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
 
 inherit distutils-r1 git-r3 linux-info tmpfiles prefix
 
@@ -128,13 +129,17 @@ python_prepare_all() {
 			-w "/_BINARY/" lib/portage/const.py
 
 		einfo "Prefixing shebangs ..."
+		> "${T}/shebangs" || die
 		while read -r -d $'\0' ; do
 			local shebang=$(head -n1 "$REPLY")
 			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
+				echo "${REPLY}" >> "${T}/shebangs" || die
 			fi
-		done < <(find . -type f ! -name etc-update -print0)
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
 
 		einfo "Adjusting make.globals, repos.conf and etc-update ..."
 		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 902982b37619..3bd2c00c49eb 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,8 +1,10 @@
+AUX rngd-confd-6.11 2321 BLAKE2B 6cdf4cf7d61e33415df1c41933d1c38c398fd96370cb4c4e257f60479a3e69428d3735802d480e1a25714854de9bc6ed997856c1c4dbbf289b7a014026522aea SHA512 32c52316ebdffef7ec07dd97b45f124c2ecced3d0f49d75ad8d226f6eff478739dab6b008e0b1f4e55bc81bf615feee9860c45f35f0994c7c65d4d439501621f
 AUX rngd-confd-6.7 2245 BLAKE2B 7643525d9a57479ba1b725ea6f976421c3df990c56d9f694b6fd2d3283c51ccf42e1be403a2208be70bc09dbd946c0cb803bfb303ae3999e97b3c3baa1162aaf SHA512 f16c5bc417e7bae86311397b3bf51927cc2cfbb0b4ee14a835fff5b62f4d12ab194329942e21cae4eec56953e4271b1fc655dcfa0be4ccbff1df1f1defdc70d8
+AUX rngd-initd-6.11 1789 BLAKE2B 317c6d3d1b7ad10e137c6b5b615354ba7a6deb256da5ef9d75253a7f84c265536db1b70b290e0029cfaf40e565c8b280e3b1ec79ab93c8f659c969b5dedc7dab SHA512 60bf2c2d4984a1db8fcfaeaebd5249ed6d428c9ccb8412813ce97e146f3143efae23058475ac8baa1c2e88b00012fc119411bcfc14b04a0128696ee69641d98d
 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
+EBUILD rng-tools-6.11-r1.ebuild 1857 BLAKE2B 89421ba2239d8f83a4ab41e8bea6100efac735b0ad1689fa818625d3e04b99697365b776da572d634348846d3aaaad12ac275a742a1a768c9c606eda47d655cf SHA512 c0a11820afb9d429254b930706b8d887f3b3ec01884373d51d13e06442ac72558723d931ba2494af7293c24a70dae8333f650f791a861a1b56ae94cb70500c53
 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/files/rngd-confd-6.11 b/sys-apps/rng-tools/files/rngd-confd-6.11
new file mode 100644
index 000000000000..ad4a6f29897a
--- /dev/null
+++ b/sys-apps/rng-tools/files/rngd-confd-6.11
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# /etc/conf.d/rngd
+# Please see "/usr/sbin/rngd --help" and "man rngd" for more information
+
+# Space-delimited list of entropy sources to enable
+# Note that some of the entropy sources may require certain USE flags
+# to be enabled or require hardware support to function properly
+# Entropy sources not specified here (or in the exclude list below)
+# will be enabled/disabled based on rngd default behavior
+#
+# Choose from the list:
+#         hwrng:  Hardware RNG Device
+#         tpm:    TPM RNG Device (Deprecated)
+#         rdrand: Intel RDRAND Instruction RNG
+#         darn:   Power9 DARN Instruction RNG
+#         nist:   NIST Network Entropy Beacon
+#                 (UNSAFE for cryptographic operations)
+#         jitter: JITTER Entropy Generator
+#         pkcs11: PKCS11 Entropy Generator
+#
+#INCLUDE_ENTROPY_SOURCES="hwrng tpm rdrand darn nist jitter pkcs11"
+
+
+# Space-delimited list of entropy sources to disable
+# This is useful for disabling certain entropy sources even
+# when they are supported on the system
+#
+#EXCLUDE_ENTROPY_SOURCES="nist tpm"
+
+
+# Entropy source specific options:
+#
+#
+# hwrng device used for random number input:
+#
+#HWRNG_DEVICE="/dev/hwrng"
+#
+#
+# rdrand options:
+#         use_aes:(BOOLEAN)
+#
+#RDRAND_OPTIONS="use_aes:1"
+#
+#
+# darn options:
+#         use_aes:(BOOLEAN)
+#
+#DARN_OPTIONS="use_aes:1"
+#
+#
+# nist options:
+#         use_aes:(BOOLEAN)
+#
+#NIST_OPTIONS="use_aes:1"
+#
+#
+# jitter options:
+#         thread_count:(INTEGER)
+#         buffer_size:(INTEGER)
+#         refill_thresh:(INTEGER)
+#         retry_count:(INTEGER)
+#         retry_delay:(INTEGER)
+#         use_aes:(BOOLEAN)
+#
+#JITTER_OPTIONS="thread_count:4 buffer_size:16535 refill_thresh:16535"
+#JITTER_OPTIONS="${JITTER_OPTIONS} retry_count:1 retry_delay:-1 use_aes:1"
+#
+#
+# pkcs11 options:
+#         engine_path:(STRING)
+#         chunk_size:(INTEGER)
+#
+#PKCS11_OPTIONS="engine_path:/usr/lib64/opensc-pkcs11.so chunk_size:1"
+
+
+# Kernel device used for random number output
+#
+#RANDOM_DEVICE="/dev/random"
+
+
+# Random step (Number of bytes written to random-device at a time):
+#
+#STEP=64
+
+
+# Fill watermark
+# 0 <= n <= `sysctl kernel.random.poolsize`
+#
+#WATERMARK=2048
+
+
+# Any extra arguments for rngd
+#
+#EXTRA_ARGS=""
diff --git a/sys-apps/rng-tools/files/rngd-initd-6.11 b/sys-apps/rng-tools/files/rngd-initd-6.11
new file mode 100644
index 000000000000..25d4c6b5e49a
--- /dev/null
+++ b/sys-apps/rng-tools/files/rngd-initd-6.11
@@ -0,0 +1,68 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount
+	after urandom
+	provide entropy
+}
+
+command="/usr/sbin/rngd"
+description="Check and feed random data from hardware device to kernel entropy pool."
+pidfile="/run/${RC_SVCNAME}.pid"
+command_args=""
+command_args_background="--pid-file ${pidfile} --background"
+start_stop_daemon_args="--wait 1000"
+retry="SIGKILL/5000"
+
+
+# Parse rngd confd file for extra command line arguments
+start_pre() {
+    for entsrc in ${INCLUDE_ENTROPY_SOURCES}; do
+	command_args="${command_args} -n ${entsrc}"
+    done
+
+    for entsrc in ${EXCLUDE_ENTROPY_SOURCES}; do
+	command_args="${command_args} -x ${entsrc}"
+    done
+
+    if [ "x${HWRNG_DEVICE}" != "x" ]; then
+	command_args="${command_args} --rng-device=${HWRNG_DEVICE}"
+    fi
+
+    for entsrc_opt in ${RDRAND_OPTIONS}; do
+	command_args="${command_args} -O rdrand:${entsrc_opt}"
+    done
+
+    for entsrc_opt in ${DARN_OPTIONS}; do
+	command_args="${command_args} -O darn:${entsrc_opt}"
+    done
+
+    for entsrc_opt in ${NIST_OPTIONS}; do
+	command_args="${command_args} -O nist:${entsrc_opt}"
+    done
+
+    for entsrc_opt in ${JITTER_OPTIONS}; do
+	command_args="${command_args} -O jitter:${entsrc_opt}"
+    done
+
+    for entsrc_opt in ${PKCS11_OPTIONS}; do
+	command_args="${command_args} -O pkcs11:${entsrc_opt}"
+    done
+
+    if [ "x${RANDOM_DEVICE}" != "x" ]; then
+	command_args="${command_args} --random-device=${RANDOM_DEVICE}"
+    fi
+
+    if [ "x${STEP}" != "x" ]; then
+	command_args="${command_args} --random-step=${STEP}"
+    fi
+
+    if [ "x${WATERMARK}" != "x" ]; then
+	command_args="${command_args} --fill-watermark=${WATERMARK}"
+    fi
+
+    command_args="${command_args} ${EXTRA_ARGS}"
+    return 0
+}
diff --git a/sys-apps/rng-tools/rng-tools-6.11.ebuild b/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild
index 3e3aa014ffe5..7b183b63ef91 100644
--- a/sys-apps/rng-tools/rng-tools-6.11.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild
@@ -63,9 +63,9 @@ src_configure() {
 
 src_install() {
 	default
-	newinitd "${FILESDIR}"/rngd-initd-6.7-r1 rngd
-	newconfd "${FILESDIR}"/rngd-confd-6.7 rngd
-	systemd_dounit "${FILESDIR}"/rngd.service
+	newinitd "${FILESDIR}"/rngd-initd-6.11 rngd
+	newconfd "${FILESDIR}"/rngd-confd-6.11 rngd
+	systemd_dounit "${S}"/rngd.service
 
 	if use pkcs11; then
 		local DISABLE_AUTOFORMATTING=1
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index fcb2ab89bda0..1a223882db1f 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,4 +1,6 @@
 AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5277c5d59d345ce96ca802a5529a22892c929bafac04c616458fa147a3bee5c89d31b0baf1 SHA512 4e8a9c58debde6480224a45559c5f2db4765213d151e47937f9142f110cac3681bf6402acaf21249a37bb17398e7bc00ae7feee68ecdb5b9363c432eac1b052a
 DIST sandbox-2.20.tar.xz 428400 BLAKE2B 11761631ce8e2e495adb41508f308bce875d416ec978e3eb3cb491d3d3a464d7653b8b81d4dcc7e5cd31e8a55069aafa263b85008651ee1d7318f32407fa4615 SHA512 06db36fc85bacf9a3a094c434b73277d8cdde986f2fad7676c42e8f84b3b8b653a1f4b1ec4af9fa1ff5484177419e18f5621275f56a8fbf3973ece524dd6d208
+DIST sandbox-2.21.tar.xz 434540 BLAKE2B c9af3b44e65d96d20b98996a4b9e35cccf6b62020d49522b9fcf50b097d4ffe3719bb334405226c5ee650943bced365547a5d8b0f707ed26ef5f12a4d15dadba SHA512 42b85e230bc89d0e02f22a7ee81b4efbb2c37ff9db24982b4b39487664a095d384101b16a4689863bd32ea91349347980b1c7f8eecb09225bc65619829c6a5b2
 EBUILD sandbox-2.20.ebuild 1883 BLAKE2B eeb4c37d3397fca51ef4f89c3f4d89443291f6385e4ace9cda138dcadeb2ea019dda8d255aa05ffdd20f5f6e535009d6caa78f7fc78cd5b1bca2f2de2cc9f57b SHA512 0524497f51519aa3404f5426f2d77dba1beb1714455d31514ac0c07bf99541ed0ea0664466683a4b65bc82615fa5c1656ec21fbc7f0742c780957622d6e45642
+EBUILD sandbox-2.21.ebuild 1892 BLAKE2B 908d3c4e1f87c2dbd01b2c5a745756fbca721be5764957016049241f9e57be4b89ab5375570fec98b71862c21c6fdfe7e97f3d281497d656df884e9e0ebc93fa SHA512 6e102f8b0e1c84d88f660ae2365077ebb0ade4ec38dc176ade00ccb10a1c18abfd1d62ad351f83acca8e42851c2e51f20c9e441bee1635eab45adf5010ef74e3
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/sandbox-2.21.ebuild b/sys-apps/sandbox/sandbox-2.21.ebuild
new file mode 100644
index 000000000000..0caadf280c6f
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-2.21.ebuild
@@ -0,0 +1,74 @@
+# 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/~mgorny/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=""
+
+DEPEND="app-arch/xz-utils
+	>=app-misc/pax-utils-0.1.19" #265376
+RDEPEND=""
+
+has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || 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"
+}
+
+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 -j1 check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
+}
+
+multilib_src_install_all() {
+	doenvd "${FILESDIR}"/09sandbox
+
+	keepdir /var/log/sandbox
+	fowners root:portage /var/log/sandbox
+	fperms 0770 /var/log/sandbox
+
+	dodoc AUTHORS ChangeLog* NEWS README
+}
+
+pkg_preinst() {
+	chown root:portage "${ED}"/var/log/sandbox
+	chmod 0770 "${ED}"/var/log/sandbox
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		# 1.x was removed from ::gentoo in 2016
+		if [[ ${v} == 1.* ]] ; then
+			local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*')
+			if [[ -n ${old} ]] ; then
+				elog "Removing old sandbox libraries for you:"
+				find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -print -delete
+			fi
+		fi
+	done
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		# 1.x was removed from ::gentoo in 2016
+		if [[ ${v} == 1.* ]] ; then
+			chmod 0755 "${EROOT}"/etc/sandbox.d #265376
+		fi
+	done
+}
diff --git a/sys-apps/unscd/Manifest b/sys-apps/unscd/Manifest
index fc063a00ae0e..595b63e2a9dc 100644
--- a/sys-apps/unscd/Manifest
+++ b/sys-apps/unscd/Manifest
@@ -2,5 +2,5 @@ AUX unscd-tmpfiles.conf 29 BLAKE2B e899d228b801b5c86b9bca3eb500acf9f07bf2f46d54e
 AUX unscd.initd-r1 321 BLAKE2B dd36cd5c9e5d677655204048b3d43d8e5fe8b2f5d9c69c862a230257ab73350a5d27c3c6b8a107f2541d617e4e6cbbb421d1e06c83270de3100ed3101715137f SHA512 41def8b588f818b7e6e42809b37ab9d794d7d30c4be7dca047f64cdded55a401fa00cee962066125efe69a8efb9080fa2588c0941f4fc915243f1e111ac169c7
 AUX unscd.service 513 BLAKE2B 443b97c41978967d2ce0d9ef021dd271e1fc292cec082f060109f28e96f83bc8c53937f63a4c38bc1e04cb5b72af9f80ddcf55b8537938e10fc8f8eca040ca38 SHA512 3a03be4807c06506caea41aa163bb036c2600566e7a73267e08ef0aebb3a288d37eb12e448740942277baee365654c6118102915479be882cb65dfefaf53917b
 DIST nscd-0.54-r1.c 73304 BLAKE2B 5c35fec2f4f3447c5d6500a7fc50c97347923d62d084134ced5c412307e8db6079e01302b16ac3e1940ee9194a31ebec464e3bd838fd8b6a650b8c0bdc66349d SHA512 88f40a10ff9ba0f46ef6f266a8ab610bf54c1d322d11df47e616e3cc007edaebdf673ec71a314b7c672d2aa7a2eac799abb0bdf87aaebd71fb8d2f7ef4e33ab6
-EBUILD unscd-0.54-r1.ebuild 740 BLAKE2B b42587fd7e7043311bcb517162135b2c9a3de0dfebc09c92a261ca62e50159fcb8f8a1862899c1089919b4fb81c941a2e0ac2fc88919d49f77705e81806929e8 SHA512 e278a50db49be1f1b4bd80e2497f635dd9c4ffe9d50f0c0cfff7b955a755336cc0d82feb333585d939665638fc586832b41c91e7ced6c330a207086aa20a23f3
+EBUILD unscd-0.54-r1.ebuild 740 BLAKE2B 860627c3aabf2c4128ead156b12df65361aaa9e5a78fc3b96f9ab7306deb427cd9466507e3abf477adc11a3be6a3a9e2b28ff8fa3ce666a3735e03b75df02db5 SHA512 661acacd38fbd0d5bcf3229b729f017b7d13803a95c566c986f0b0fc985a0801bacc9904682bc0c32f1fdb867f38f1d53bb39f19959a1f20db920fb685e865fb
 MISC metadata.xml 464 BLAKE2B a35add2ef5141e6d23e0410b727bde1a1a09817d1498b0f962b6c315a204ccd17bd962826c9c0b0bb1a765d07cd105c77641a6504073369ac53c6e41ce8bac63 SHA512 d5869f42886829dee06a1eed99b398182e252d3935d84cd3e88432edfa8a56ad4b9aa461efa60dc70c4217a993f37a193a76c05be472fb19587fe2f0efe38b8c
diff --git a/sys-apps/unscd/unscd-0.54-r1.ebuild b/sys-apps/unscd/unscd-0.54-r1.ebuild
index 93f6096726f3..f8010311180b 100644
--- a/sys-apps/unscd/unscd-0.54-r1.ebuild
+++ b/sys-apps/unscd/unscd-0.54-r1.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
 
-inherit systemd toolchain-funcs
+inherit systemd toolchain-funcs tmpfiles
 
 DESCRIPTION="simple & stable nscd replacement"
 HOMEPAGE="https://busybox.net/~vda/unscd/README"
@@ -30,7 +30,7 @@ src_compile() {
 
 src_install() {
 	newinitd "${FILESDIR}"/unscd.initd-r1 unscd
-	systemd_newtmpfilesd "${FILESDIR}"/unscd-tmpfiles.conf unscd.conf
+	newtmpfiles "${FILESDIR}"/unscd-tmpfiles.conf unscd.conf
 	systemd_dounit "${FILESDIR}"/unscd.service
 	dosbin unscd
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-12 21:55:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-12 21:55:15 +0000
commit	7218e1b46bceac05841e90472501742d905fb3fc (patch)
tree	56fae051db521b8fce8014cbc8b11484885b14b3 /sys-apps
parent	6d691ad5b6239929063441bbd14c489e92e7396e (diff)