gentoo resync : 30.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-30 17:27:54 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-30 17:27:54 +0100
commit: f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
tree: e907cb121b30e3c1df1710719c0ddf4029597a47 /sys-apps
parent: db063b515939ab15261136b24e4bc44386335c0c (diff)
54 files changed, 286 insertions, 2723 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 718c5f9f66d5..c0b929532ec9 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index d1adb546be1d..d26f45187638 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,4 +1,6 @@
 AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3ecc7a1a8587af5d56ce3ffde76608ffc7d5cde099fede8b4da76247ccabd7060b0306d2311db716b12e0bd4fb6062ea782fd2dd3d SHA512 05ffb53243a178e91d67066a30039e9ccc21caabe7769e8920548c615b6d9d23959125f2fc9073cc70ba3f3502df7d780db59e4768e7add2682af98079bd6bd4
 DIST debianutils_4.11.1.tar.xz 157536 BLAKE2B 2093568ff6e779d25ff2960b1bc6b12bcd451eaf9ad586ee48d6a6f52bcb0d53c58cb01697eee3fe47d22bf9019fedb5e2857fc8bb358b1449f65079cab1190b SHA512 8283e42f190a9c59c54817a745e219fcc9a1f8995204d62aff84f755ace041e433fe707d3b4373060207a70c9c01d958234281061f77e6e6fb6c560c79711772
+DIST debianutils_4.11.2.tar.xz 158132 BLAKE2B c2a95c90b4267e3b1d61c21db562f960b4666982c488e69a757fb0a7a42e8e739d44f553edd8cf532df30c492e999920ab63ec3580479de7de5d901d75de76fc SHA512 0bd9098beee78b3c8dae839f0c29e9f142cbb22f2ced473cf7ae47a14d9493ba882c1829eba213780392a87a3223b3689729754c8ded80a091efaef3f6f903fd
 EBUILD debianutils-4.11.1.ebuild 912 BLAKE2B ab957374835ccb707a397e8039ca176804822429e1641a3e959df05ba9fda3afbd818a7aafda525115270b750f0c7cfb952bf7d650939f6ff3ea388f80d2be3b SHA512 8f81748727bf9a8d4e3af8165f3859a544c80e96108f83c87c97ac8b3a9a2e5771b724707d7534e2409862f3803e14133c3344c16f4bb74a90db5d91579f73ae
+EBUILD debianutils-4.11.2.ebuild 943 BLAKE2B b5a81e52dd6dcb84abea8c15d932c7543ecd3fea7c999c2f4482b5b6b4378d1d4494e9885f4773ba85d78dd33cdbba911bc5b7c573cb89f270c4a2c3538bf673 SHA512 7dc53b39049e32c8f2a4f63355c3908706a4cb3276df734f27fc2e2c4f20325ba0e3fcc6245b054fff50115b35e077fc19af1f3a304aa92fa5a4ef83f40b2a4e
 MISC metadata.xml 445 BLAKE2B e074fb05a82e69de19cfca5e102bd6577060cd6bbd3b5b6b7e4c8f24d8715b50abe3e7444eb04827d41f73777ab2588807b708636287271c39e14b2bcd7c90ef SHA512 b07bcaaba5700fa08a6dbd84c514ff720efd155fe442cc35a7c62b5c0b64802ca286c991f20f0d6d56b15bb6ecc097804bcee83b0d924b868e8c9106effa1db0
diff --git a/sys-apps/debianutils/debianutils-4.11.2.ebuild b/sys-apps/debianutils/debianutils-4.11.2.ebuild
new file mode 100644
index 000000000000..b398e3f5f041
--- /dev/null
+++ b/sys-apps/debianutils/debianutils-4.11.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="A selection of tools from Debian"
+HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="BSD GPL-2 SMAIL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="+installkernel static"
+
+PDEPEND="
+	installkernel? (
+		|| (
+			sys-kernel/installkernel-gentoo
+			sys-kernel/installkernel-systemd-boot
+		)
+	)"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
+
+src_configure() {
+	use static && append-ldflags -static
+	default
+}
+
+src_install() {
+	into /
+	dobin tempfile run-parts
+
+	into /usr
+	dobin ischroot
+	dosbin savelog
+
+	doman ischroot.1 tempfile.1 run-parts.8 savelog.8
+	cd debian || die
+	dodoc changelog control
+}
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index c30f31271881..0c5f6099c799 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -3,7 +3,9 @@ AUX fakeroot-1.20.2-glibc-2.24.patch 1021 BLAKE2B 1f907d709be9819d4d7a9113fe17d7
 DIST fakeroot_1.22.orig.tar.bz2 338238 BLAKE2B b6cee7483ea7ec17747e638cbfefa565f26b3b00517f3ec90280f8ce556ce8efa3833accc07885365e20f80967a67291fadc27cd80766548cc86e2aa70c74c33 SHA512 193478d9ff88ca2ae69fe47b73b6c61aeb2ba3f2a9e7ed5d455022705857c6f34cdcbe2d3f614c4c4c9509368dc78b9a7b7aa56fb3b50bb3309448140abd796a
 DIST fakeroot_1.23.orig.tar.xz 298080 BLAKE2B eac3da8486d57266f0f6af0479f0fcec5aaf82f4707ad8f810f954373a31cf5f390ef57dcc71ba630a1d4a578df95ac9beda9c93b3c75adffcbc89860f442b69 SHA512 0984679207e6e340abf715d4b26a213f85420cd8c58f21e65eb069337a3bd67436c6f80168412c10b28701689ec63290f122a5ff5d44a57b2b166aa72799d036
 DIST fakeroot_1.24.orig.tar.gz 522497 BLAKE2B fb08ed6512a3e26538662ceb28a197b85fd4a05c37b543529df6880e01c64bd774037bed1230bf7d7fe0bde798364c2fd0fcfab257fff4d3e6ae9800c076a5b0 SHA512 b15db7bbfb03264f294fb3b42813e17758b43ef7f121e55a24af9ec30ff3f4ec8eb0392db88133e56f9728b3828f6c1432d1e5d2e881a69d083ad444b9177487
+DIST fakeroot_1.25.1.orig.tar.gz 126880 BLAKE2B ea92815d005422ade80a91d1351c500614f7628b2173caf23bab2192f9395440ba4429ac773723c79a0f0205b7c750db9c1cecbefe7e9e2c442c8a92938df0cf SHA512 0e340aacfb49558ee6719aa11aa297ccda2afe2f66209da8fa10e45ec7954d5db689717db38f30cdfb9d89b75ca63ec6aed42e2cc314fd25c60262aa735eab0d
 EBUILD fakeroot-1.22.ebuild 1067 BLAKE2B 12d38863a89eb5c073633b02fcf04845d48959821ad1a744b3329e98175164392dfa6cc14f006beefc3a07bb5df9b3944b016b59ad7755b8f3514e5bd7dd0d87 SHA512 5ef0839952eb6c3894faa97c9f0ca5e4676767b34c450d6375551301dc4d775188db6248d36d4abd0bf77e80176a7dc6701ecc79dd08a1ffda33d6d879d94d9d
 EBUILD fakeroot-1.23.ebuild 1074 BLAKE2B e0f810e84eae6eea778b7b23b8bd6e8cf9c83db4f9b58cd9e6705bb1811f8ac2f626959507865cd8b234577434a4e2aef6b77082b0422eac481e1e63a2907722 SHA512 76fe90adcfa947f794365bd641beb1d63ab76295bc6d5dc2541800c856594d61fe3c34aa1bb9c62e7463ed73986c59461cd8bbb5b421d493336ed313c2632904
 EBUILD fakeroot-1.24.ebuild 1081 BLAKE2B 83324f005105c63853a8609a59095032ba7c559c6a211257f5e834eccc331f0d6760ff46586ed64ca0847c2fcb4190160449538a201b3c480ecffac867d1d9c8 SHA512 aac064b0369eed287f53944cd7ce1be7455d8bd2eb647b2d7499b67d306def045a32dd994245d64c6ef632b7d240cbc258405563bd777e3239f154ec524ca531
+EBUILD fakeroot-1.25.1.ebuild 1185 BLAKE2B 53f64abb90b913657d03ae5883eff74762abf19a1562b26f3ff18dda0e80ad0db43ff88ba5378ceeecc76e38c64fb1ceebac1d544a928170fcd21aab25ba4893 SHA512 c9ee360961b83fa8a3990a7f3e6c4c18cc7b5e07c37b5944c283171662121b98df5bd779bfd4b27660cca8e0dfe7a816221d22cd096440af3a224f33050ca5f5
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-apps/fakeroot/fakeroot-1.25.1.ebuild b/sys-apps/fakeroot/fakeroot-1.25.1.ebuild
new file mode 100644
index 000000000000..eac32e7e9542
--- /dev/null
+++ b/sys-apps/fakeroot/fakeroot-1.25.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery"
+HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="acl debug static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sys-libs/libcap
+	acl? ( sys-apps/acl )
+	test? ( app-arch/sharutils )"
+BDEPEND="app-text/po4a"
+
+DOCS="AUTHORS BUGS DEBUG README doc/README.saving"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	# Create tranlated man pages
+	pushd doc &>/dev/null || die
+	po4a -v -k 0 --variable "srcdir=${S}/doc/" po4a/po4a.cfg || die
+	popd &>/dev/null || die
+
+	default
+}
+
+src_configure() {
+	export ac_cv_header_sys_acl_h=$(usex acl)
+
+	use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING"
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
+}
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 082bcf8fea83..d522d90fb31c 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,5 +1,7 @@
 DIST grep-3.3.tar.xz 1473056 BLAKE2B e1592b623d1f32d1b21d127b0d28f8f6501d4b854ff2de810d12d43292c00e6af887b038f22d0c4c45c314b6e9d73a82dec6d737519c674bb139c2ef70511aa0 SHA512 e4805dbddf7cd0f0faf412557d408509650c1ccf703bc450f10a3f727c690dbfaa1235aa81939a0e4b7ac6190f88c15ea1fcc562b343d4b4c7550f967aeb15db
 DIST grep-3.4.tar.xz 1555820 BLAKE2B 4e1924d6d5eb66faca93b405cce9784d726a476f26a384c3b44375cb09f817008aeedaa701a30b6c1f21c030902d603a80ec80105b2d5d76eadf09b910d573a7 SHA512 0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206
+DIST grep-3.5.tar.xz 1586396 BLAKE2B 62c98acb29b9998e60b64cacbe82df4f03a8d8a427a060d00283506155e6acadc4d77e8b8c2fa110227715c314ac7cde38a38eff0b92eb0ec793c59ba2562ea5 SHA512 8367aa930ecf7fa5c07153666bf7991097648bd7bf4ca672e6b14e0bb806c89991ec55d2880812877761cbde1d33562f22803835d74bfcd293c2246e274306c4
 EBUILD grep-3.3-r1.ebuild 1463 BLAKE2B 2592d406868784921685aa21b321caf12126627c935d729a8827048532779e7deeee21598f699ea6f9d238d945dfbca59b72555064a5ac32d5ab7fb93720bc47 SHA512 86392996c511087c09c2822dd861d6c223482ebe97b7c77a53673f003447b393cfee09647a302a939ca98cf5e7b123012323ff0dad00e9df0563d86f575f9693
 EBUILD grep-3.4.ebuild 1515 BLAKE2B eb01e846dab2fc7654fd5172d8b6dd9ba7c4affa278b28034d708a033604ceaefbda40c0c55500a6bac702e6503ebb6541029bef2faa94dc64405b79d41f970b SHA512 dadb38743f17805e0eb9f7592209645514edc0e36d6e8ccff23dba5e1c32db4cca3469fd7ea90efa10946018a60d3e915fa344963032f72d8dc5dcf8ead03d02
+EBUILD grep-3.5.ebuild 1522 BLAKE2B bcfd24d3219eb4daa64894084e592d277dae2cbebda55ed2c7cc71688cf4630766e5529ef9c04cd2ca4a57af7ad9cf49c88a0e04c7ec72a5ea76ab4e5da1cb40 SHA512 e2654150a88cb90c194e9cc20828ababa8290fbfabe98ab93c95c41fc80c0b29800b93bb415c0b5a9194705f1a7b518ff77b33cc16489057311435742cb9db69
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-3.5.ebuild b/sys-apps/grep/grep-3.5.ebuild
new file mode 100644
index 000000000000..a581969446e1
--- /dev/null
+++ b/sys-apps/grep/grep-3.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="GNU regular expression matcher"
+HOMEPAGE="https://www.gnu.org/software/grep/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+	mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls pcre static"
+
+LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	nls? ( virtual/libintl )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	sed -i \
+		-e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
+		-e "s:@grep@:${EPREFIX}/bin/grep:" \
+		src/egrep.sh || die #523898
+
+	default
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	# don't link against libsigsegv even when available
+	export ac_cv_libsigsegv=no
+	# Always use pkg-config to get lib info for pcre.
+	export ac_cv_search_pcre_compile=$(
+		usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" ''
+	)
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		$(use_enable nls)
+		$(use_enable pcre perl-regexp)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/hprofile/Manifest b/sys-apps/hprofile/Manifest
index 1feb8cd2ce1e..cb17916766ce 100644
--- a/sys-apps/hprofile/Manifest
+++ b/sys-apps/hprofile/Manifest
@@ -1,9 +1,3 @@
-DIST hprofile-3.0.6.tar.gz 18236 BLAKE2B b2aa89db87949ff0787dcfb84cc37b21e52c451abece3f10b13e95e37ad1aafad240a42ef5de23453f22b7fc23a9523abb8ae0dd730c33b4a9cd9a44b7f760b1 SHA512 86568314a24397d2ec5898dd3061e91a5597eff49679f0533fdcb0d2c9b76cdb131b25fe45167370174d1514ba222a781c0f09f98a1cc5407898e36c30ff677f
-DIST hprofile-3.1.1.tar.gz 18489 BLAKE2B d76c4b03e9e6873cb3f6f0dce415fd39ae49d73bffa4935a823b780e12c3f034debd20034786ba6790a6acb17181a67801b81cdf246c9f85ff5df344d8f1ff0a SHA512 b42bf79840270eccf164a0ba2d5def7d50846fa7043319b23be2be3fabece014a031cc4197c2688a6c4f7a542f0e0961ff538ea879eac81a7f03c024a4d023da
-DIST hprofile-3.2.2.tar.gz 18983 BLAKE2B f455c6895f2e550f2fd7e43952284f7894775caa1a1ad8d24171d6978dce74fb5b5f6c742cd7094de789aad2ede2023c4ad6e77207adb6b903df9c5984c8cf98 SHA512 169a6c68659ea0d84b89bf25c8421bdfe7d106c77ca7cf80bafe65a4b24a04267729ef617e795adee5bdbcbfb56102a41c2ee7c926027aef69abe4cdee499328
 DIST hprofile-6.1.3.tar.gz 18719 BLAKE2B 1e70bad6426b73fa03d4c987bc5c585413122462dfd7270f140a78b351633b75d366dd2efd328296f5ad3c78ccafe2182f758e730e6af809e1f16e010f5a93b1 SHA512 33987e1fa61619794c40dce737878a37a7c202e50edcd086fe6b59829908f019438a5dccdbda45eb798e227eb2a6ffd3510788645cd73751baa14b5028f6f670
-EBUILD hprofile-3.0.6.ebuild 522 BLAKE2B 1ffdb00c4af7096ab2e9f28c9d4fe0f351043e20d7022eee8ef6e74e6be70648aa3ab13adc2d022488fc99491332b8d9a2dda8139f0f6a25d664322ed11438e0 SHA512 969e8539dfbcec08f4ab670f342409eb7ff812ad6b70517e00d3dac43b91f1443f470e686c25c74664304afb7c4bbbe131198b9a9a9905eed3d9ebb0ef73fb59
-EBUILD hprofile-3.1.1.ebuild 522 BLAKE2B 1ffdb00c4af7096ab2e9f28c9d4fe0f351043e20d7022eee8ef6e74e6be70648aa3ab13adc2d022488fc99491332b8d9a2dda8139f0f6a25d664322ed11438e0 SHA512 969e8539dfbcec08f4ab670f342409eb7ff812ad6b70517e00d3dac43b91f1443f470e686c25c74664304afb7c4bbbe131198b9a9a9905eed3d9ebb0ef73fb59
-EBUILD hprofile-3.2.2.ebuild 522 BLAKE2B 1ffdb00c4af7096ab2e9f28c9d4fe0f351043e20d7022eee8ef6e74e6be70648aa3ab13adc2d022488fc99491332b8d9a2dda8139f0f6a25d664322ed11438e0 SHA512 969e8539dfbcec08f4ab670f342409eb7ff812ad6b70517e00d3dac43b91f1443f470e686c25c74664304afb7c4bbbe131198b9a9a9905eed3d9ebb0ef73fb59
 EBUILD hprofile-6.1.3.ebuild 523 BLAKE2B e0cfa25051185334bc936d05b871144f8917575aff7f9bc63678ad67c991aa91e57696c0f75a914236213c4aaeb500d8a2c27203d62611d798df71ef47ae1360 SHA512 c726f3d32ef34db1081560de32880ec4c838ed81084e78931d0f6342cf837ce4c957c783bcadbbaa6e06e01ea92ed3afaf6ebead2422f30285bc943c6c82be6e
 MISC metadata.xml 334 BLAKE2B 248be9d6332ce0d0ac7317dbac6b470f1c9e6a829c3adf1bc3a37d8ece5c18f2b67aa561267a2ef406318d06463ad2f20a69c0a753fc24ee826d52beed8d09ab SHA512 e42c69bbb110f8dcd81c1d5a58b04360888bc13f934b54609c5bd65d6a80954dd73b5e777d295713b30fbe0507bb933c09e5fcb31fdf30295f1d2e68de02d053
diff --git a/sys-apps/hprofile/hprofile-3.0.6.ebuild b/sys-apps/hprofile/hprofile-3.0.6.ebuild
deleted file mode 100644
index 74a49b93ed92..000000000000
--- a/sys-apps/hprofile/hprofile-3.0.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Utility to manage hardware, network, power or other profiles (fork)"
-HOMEPAGE="https://github.com/tokiclover/hprofile"
-SRC_URI="https://github.com/tokiclover/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	sed -i '1s:.*:#!/sbin/openrc-run:' hprofile.initd || die
-	sed -i "/^prefix/s:=.*:=${EPREFIX}/usr:" Makefile || die
-}
diff --git a/sys-apps/hprofile/hprofile-3.1.1.ebuild b/sys-apps/hprofile/hprofile-3.1.1.ebuild
deleted file mode 100644
index 74a49b93ed92..000000000000
--- a/sys-apps/hprofile/hprofile-3.1.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Utility to manage hardware, network, power or other profiles (fork)"
-HOMEPAGE="https://github.com/tokiclover/hprofile"
-SRC_URI="https://github.com/tokiclover/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	sed -i '1s:.*:#!/sbin/openrc-run:' hprofile.initd || die
-	sed -i "/^prefix/s:=.*:=${EPREFIX}/usr:" Makefile || die
-}
diff --git a/sys-apps/hprofile/hprofile-3.2.2.ebuild b/sys-apps/hprofile/hprofile-3.2.2.ebuild
deleted file mode 100644
index 74a49b93ed92..000000000000
--- a/sys-apps/hprofile/hprofile-3.2.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Utility to manage hardware, network, power or other profiles (fork)"
-HOMEPAGE="https://github.com/tokiclover/hprofile"
-SRC_URI="https://github.com/tokiclover/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	sed -i '1s:.*:#!/sbin/openrc-run:' hprofile.initd || die
-	sed -i "/^prefix/s:=.*:=${EPREFIX}/usr:" Makefile || die
-}
diff --git a/sys-apps/hw-probe/Manifest b/sys-apps/hw-probe/Manifest
index 229239e008fb..39af96933190 100644
--- a/sys-apps/hw-probe/Manifest
+++ b/sys-apps/hw-probe/Manifest
@@ -1,6 +1,7 @@
-AUX README.gentoo 301 BLAKE2B c352d3f7e0038ef8f71f6e95376e91513c45914f7d4c31ec0390a0e9745360d7114b3c4e2743d2cb5872241073a3a4087a3240f2f0ef89e3203b5500520d7eb2 SHA512 a20a1a910a7f852844bfd8f03e824e74760c49c5bf7171f1dbfb16976805179ed79a3ae892ba70e99bcd93182bb1d83f491b9a5f7b64e94478172a424c00350e
+AUX README.gentoo 296 BLAKE2B df18c0796912c5cfe6e8f88427ea690512bfd519aa3502528df6f6936571497937a22f8edcd9e9143d915e648f9b341043141cc6d0ae35de55d22d44c0335f6e SHA512 4ae61b89352a4bbe70f4ea1b85eb19e58c2b81475722dda25c289fbe15e7e6e07df51b08471c5d3c5d7a3b12cc09ba599e0d2158dee68c9c66f60908d57b4326
+AUX hw-probe-1.5-disable-automatic-upload.patch 1140 BLAKE2B 47ae86326941c5a86f9efd7614509a9af36261c51ef85f21ea1172ae91c3966c113aa51f8841a56005f75b0370b57dff6196fe49a77c766ce1efd9003ee0e249 SHA512 7cbe2dc17cb513086f85052b43349fb64bd12a0f3671bb37109a20d62cf565f8bc8d9e798a7d0a7e53896d187e8c575f850861e381885f2ac1f40d2c0c919063
 DIST hw-probe-1.5.tar.gz 113996 BLAKE2B 59f6fc27e2cbb99a4b7dd9428e32a93dce2ffcc1133e82539b8836a694e6c5634fe2e172732675acf0d83504907a750c63f138d6dec236039eb7c805010a8383 SHA512 80dd2484bd317ac1e86d7f434626f288648aebf110a4bf81c0c05548abcb19d990119c1690fcb5796384a6c32fd5c1e827698a31165bfc41ef6df9fc7fdd368d
 DIST hw-probe-1.6_beta2.tar.gz 143569 BLAKE2B fc7b7562f86eb1b26fef32a8ed9b4a8d01c5621bedbc7e810d5a011c53d528b000ff9df312cf5e3f0ab455558e08e2b9a3ddcd543cd6856208466721f9a0e13c SHA512 2727e7b0fe449cbb6dd21fc112660df4ec666be845bbfd21037b41372a499dfb80c8c2dc37bd222032c68faadff91192a6d6f5229353cb0fc63b8e3dbd715f5d
-EBUILD hw-probe-1.5.ebuild 2214 BLAKE2B 8b2051627a39feb3973720423910dd8b9fc33725575bd4003756d4156de6f8b6543e8e003c412d8f81e84f57315ac568a23cffa7b81b7fe0dea3e373f59a0c23 SHA512 ae42f62eaa907b32b2cab911aadd9b863ff92338ea0dedceddb556e63ebe280d4efd6411b0bd31b8f8f236df5af0bbed2958ba37f55de4355ca1f132969afe1b
-EBUILD hw-probe-1.6_beta2.ebuild 2381 BLAKE2B e1da306e2178569bee0d11b5b0253fea11f90774f5f403c7a054461c95f1b5bae6e4aa66d519c218b4839751dbdc0512946c3f33808adba7a1dceac95c6bcb67 SHA512 a02220c7a13c3dd0991f0dbe40aabb7107289e1af7be9e036782ceee1cfe7be47df141cf429ffa0980cd84ab720cdb083401d4dcfa213658f2590cfd98364228
+EBUILD hw-probe-1.5-r1.ebuild 2282 BLAKE2B 9992151a7b468d7138ec4a001f5575525489f546c58df29b5eefef9b3db5f6607f2f01f8289f8ad8474d20f21b6f57d1381c8b6c3a446188790912544cca5a54 SHA512 b539734e3a5cf0735c99ba8fdb6aca628e8e84d8d02739676c35c13d1880b891f50f4d8f209d3ca595859f8657e7618900ee39c461c5989580b62afc9b40dcb6
+EBUILD hw-probe-1.6_beta2-r1.ebuild 2449 BLAKE2B 20d24381c6a18034608f9d3fdd5c6075bbe10ec9672faa6dcb4ad3f5ba2b258c8e5cc8d0e9b9c596c64644686b5a65977ee918e537a98212f2c4190daec8e2ae SHA512 80b49c3fb7cc001f476619f47b535139765708ab4d07cc2e45134d4c1bcba1407cbe904f7494bee613b652c6461fb472e5146c12b4f6f0cd7b10267607282916
 MISC metadata.xml 646 BLAKE2B 1cc93bfb0e3544c4c746e80ff21675fa22d3103e14a040ffedfcfd24e73d8d968decc318e4523a03815e85de4ef85926ac20d4dfdf7cde5a3445ca29f11f6de7 SHA512 2ea8a211186b71ebc008c9999225edef063c8c8e0317d6e4c6149cc6ec6281a84065bef3dc93b4308f8567860fb75c19287aa91b5ab41e6a68229fcbf1c5a474
diff --git a/sys-apps/hw-probe/files/README.gentoo b/sys-apps/hw-probe/files/README.gentoo
index 521f7f4aaaaf..61786ade26bb 100644
--- a/sys-apps/hw-probe/files/README.gentoo
+++ b/sys-apps/hw-probe/files/README.gentoo
@@ -1,6 +1,6 @@
-Please keep in mind, that all results are being uploaded
-by default directly to the Linux Hardware Database
-and can be read by everyone in public.
+Please keep in mind, that all results, as they are
+being uploaded directly to the Linux Hardware Database,
+can be read by everyone in public.
 
 In order to identify unique computers and hard drives,
 a 32-byte prefix of a salted SHA512 hash from
diff --git a/sys-apps/hw-probe/files/hw-probe-1.5-disable-automatic-upload.patch b/sys-apps/hw-probe/files/hw-probe-1.5-disable-automatic-upload.patch
new file mode 100644
index 000000000000..4f16c0d87fae
--- /dev/null
+++ b/sys-apps/hw-probe/files/hw-probe-1.5-disable-automatic-upload.patch
@@ -0,0 +1,36 @@
+From 6a211f965c21f1aa2e8612bcd7e2966ce8e8c607 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conikost@gentoo.org>
+Date: Wed, 23 Sep 2020 22:26:45 +0200
+Subject: [PATCH] hw-probe.pl: disable automatic upload
+
+Due security concerns, running 'hw-probe.pl' without any parameters
+shouldn't upload directly by default all data. Instead, the user should
+add '-upload' if he really wants that.
+
+Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
+---
+ hw-probe.pl | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/hw-probe.pl b/hw-probe.pl
+index b71f250..1bceb0e 100644
+--- a/hw-probe.pl
++++ b/hw-probe.pl
+@@ -217,15 +217,13 @@
+ 
+ if($#ARGV_COPY==-1)
+ { # Run from STDIN
+-    print "Executing hw-probe -all -upload\n\n";
++    print "Executing hw-probe -all\n\n";
+     $Opt{"All"} = 1;
+-    $Opt{"Upload"} = 1;
+ }
+ elsif($#ARGV_COPY==0 and grep { $ARGV_COPY[0] eq $_ } ("-snap", "-flatpak"))
+ { # Run by desktop file
+-    print "Executing hw-probe -all -upload\n\n";
++    print "Executing hw-probe -all\n\n";
+     $Opt{"All"} = 1;
+-    $Opt{"Upload"} = 1;
+     
+     if($SNAP_DESKTOP or $FLATPAK_DESKTOP)
+     { # Desktop
diff --git a/sys-apps/hw-probe/hw-probe-1.5.ebuild b/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild
index 88364d9d246e..3d73d2db78ad 100644
--- a/sys-apps/hw-probe/hw-probe-1.5.ebuild
+++ b/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild
@@ -26,6 +26,8 @@ RDEPEND="
 	virtual/perl-Data-Dumper
 "
 
+PATCHES=( "${FILESDIR}/${PN}-1.5-disable-automatic-upload.patch" )
+
 src_compile() {
 	:;
 }
diff --git a/sys-apps/hw-probe/hw-probe-1.6_beta2.ebuild b/sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild
index 146c6c196eca..10f2227e5771 100644
--- a/sys-apps/hw-probe/hw-probe-1.6_beta2.ebuild
+++ b/sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild
@@ -12,6 +12,8 @@ DESCRIPTION="A tool to probe for hardware, check it's operability and find drive
 HOMEPAGE="https://github.com/linuxhw/hw-probe/"
 SRC_URI="https://github.com/linuxhw/hw-probe/archive/${MY_PV_BETA}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${PN}-${MY_PV_BETA}"
+
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -29,7 +31,7 @@ RDEPEND="
 	virtual/perl-Data-Dumper
 "
 
-S="${WORKDIR}/${PN}-${MY_PV_BETA}"
+PATCHES=( "${FILESDIR}/${PN}-1.5-disable-automatic-upload.patch" )
 
 src_compile() {
 	:;
diff --git a/sys-apps/init-system-helpers/Manifest b/sys-apps/init-system-helpers/Manifest
index 7cc293b4d9f7..cec6d3463acd 100644
--- a/sys-apps/init-system-helpers/Manifest
+++ b/sys-apps/init-system-helpers/Manifest
@@ -1,4 +1,4 @@
 AUX revert-openrc-management.patch 798 BLAKE2B 1e04e2f9c361eb0c125e5b23d0b18c58198ad968fec5965f43e6a5e8b8201d29c7ad2c05431d7107d99acc75ab397cfd90121f7f0618f9bb440a8d6687039c20 SHA512 8d8cc8886b5d731b7538425e6be10b4fa8d0c8b8eb946a64e885a0f9dc19c02d596a803716a8a6d681fb9e408650993b9c81ef23d2d0ab53485d65b15863ace7
 DIST init-system-helpers_1.49.tar.xz 42660 BLAKE2B 548711283b04e3df13e9287154e2648b99ac80c2cdc71a428b4496220cd7c319f8f7afccb1e611c07b9d801837ef8799a3295a0490aa62812d47b728ba5ddba9 SHA512 bd612207e51e18a44f9c90e1e5b069ab39e06c776b8a0d6c9ecb367890d4a44ff02b3028418ac10a688782745331f39bb9299ba836f333b712e6fdd7ddc8da16
-EBUILD init-system-helpers-1.49-r1.ebuild 872 BLAKE2B 1401d9d4a4aa3e196618fa8ab0952ebc19054eb59ff9773bec1d4cbc6152252f7704f493fac58d182492784a931c4e74c7f5d80b7b1a5830d301d59f96af2031 SHA512 719a3c90e1e5abe4baef18f4ee0f1cce4b6f57a832612e48e567f86b0a9f68a94fbab84370e65237ff1fcca3e83d9eee6722209d115f9c03f09bd61c1b3102fb
+EBUILD init-system-helpers-1.49-r1.ebuild 879 BLAKE2B 2f24bdf051c0066181d636af3968e60f66788d157b1752116dce1ea2d7aaa75d19da137bb310f9fd1f6ca41c864cf259c1d07b27324f58028f85e3c39fd9b2cb SHA512 ed86a64b4f925fba0f6fbab4bc2dc24ef9b57b936d739176f82759d1ecc4e6e80b88db2e52aa5845e6fc34c93d88308b79169bdf1554becb0e06147c0e038631
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild b/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild
index ede540985543..1e0096905cac 100644
--- a/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild
+++ b/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/i/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/linux-misc-apps/Manifest b/sys-apps/linux-misc-apps/Manifest
index 868297a76aab..8cf63c9fe726 100644
--- a/sys-apps/linux-misc-apps/Manifest
+++ b/sys-apps/linux-misc-apps/Manifest
@@ -1,16 +1,7 @@
 AUX freefall.confd 147 BLAKE2B b8fcd23306df7122e47e765dcba00cbec0fa7e2d9758d606e7e80cd3195b3fb7bce976fafef801812b425827f99689cde668106430119fcb57767bc816de635f SHA512 556472ab75ab8d3ccbedc44902a34bdef433430aa86fe5d8a125b27101f81e9c7c77e5a1fdfa84aef35078046e4b27a33eeb17d1745871f9e1f41e0ef64b2ba9
 AUX freefall.initd 1111 BLAKE2B c9c5de16da61124a4e984b47ca7cfa368cb5d02bfa85286f2cb9eaa50557da1b55d86b7a5beba5a5db60653c4a84b57276edc982782b7f8509d9a33cf45956e9 SHA512 e4d4d724276d9b64b80b29be5c28b9efc15556dd31545c85e45253aec2305d37af4b60a0be3f2f279c76c27aba5a968053a9bab7d08f2d559277701fd84375f4
-AUX hpfall.confd 144 BLAKE2B 9abe0f8d8a3454d88aaa00c186b4513045cbdc96a7b1679780f26ac8b0dcd4c082bc9807ba39efe6e21d15d3e6dfafce28ca121b95c60ef808f3c8a252d38879 SHA512 995fae481f169a2e53e4985113d5581ec37690a0fa2b77ca4665ff2e26d1ec073edc12d4001d4ca144ba3e3ce57b269bd8016ea024844fa3bde145bc7e4945f6
-AUX hpfall.initd 1098 BLAKE2B 0f854ffc7ee8649ca04aec13aaac0709ced20dcdf1981b9ad23076c9d97c0f8e2119ce9c40744b5af5d79f2680986f993f8a6680878b8dc153efa733e6528b72 SHA512 64c716255d8ecc5828d7c54b4aef9406353e2d3a2f0965882342344c533bebf7826b4a76e58263b974dfc1162b49688e2009eeb5a467e4361ab8241d23a028d7
-DIST linux-3.18.tar.xz 80934708 BLAKE2B cf796fa1eb24276470b51bd3754f02932e57c6469e45959893b3714457ba33f0081ff04137990f228e1aae6d42a05073478a3ef932df468af7cd02bf8c8836c4 SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009
-DIST linux-3.6.tar.bz2 82296001 BLAKE2B 454e1c86dd5b7d2f9ff8ba777feda3743b620ecf4325c06b7270b2b1f60d2af2797836b509252e7140980ab0ba620d8fc98dd5d3968d19f8101c9327af262eef SHA512 cbaefc2c4c8ab2251c3345b7b2c88d55a49e3468d8b177b05dd6d96a802efa9a052b1a1ecab8b71298bac97f45259516d88253838332b4fdb4307780ebcddce9
-DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
-DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
-EBUILD linux-misc-apps-3.18.ebuild 5027 BLAKE2B 7905159d229d6076acb850b4f453689c731f03af48279a5e2e607a0fcea41b35a90c6491e73f3adb2c7167cf02ae28e4f618dcb27a4fbfa780eaa778cacdf483 SHA512 6552b6eda377a8dc7eea4ec0a452c120fb762954eab016502898d9857cd9413c4b6a59810e50d552d523bc71c441a6c740f66f6ac0926b2910bd788fc7d8a2aa
-EBUILD linux-misc-apps-3.6-r2.ebuild 5110 BLAKE2B 7281954256d85ca023c37d7a31bb0662e90976d7d442219926a3bfce1a51a590b2a03f71921958db28ce5c757781465e15e78ccb8c4899c49dae8cd04167e78a SHA512 5b57aa7d64ef4f7381c1476962e439404b3131a28e4a0d461d0cde2cd091ea69dad00dbb7f621d95f32cdd24a26969645d587e06aa3dc0429b2b4a39c38001f1
-EBUILD linux-misc-apps-4.19.ebuild 6339 BLAKE2B 1c2a523d86dd4fdd3728128a1186918966956624b02075ecfc25c5d4d0ebf616689b9b761d84620256286e55dde130d81bee3af5018808910ac06015144153ca SHA512 c1703fc466ad5a4458529b64189ec59539f9c3de38e47e963d4faa10fca6edf93c1341eb1b95397f1567e583296f15fc1bcdbd01175516e9afecc8c93bcea8aa
-EBUILD linux-misc-apps-4.4-r1.ebuild 6368 BLAKE2B 66929629228f66fad494818f2d121358f061d86107f364dfc54a3088faf4f1cf466924055eeff0317c990ef267da95aed509037e390f5fea67d7fa82fb559f24 SHA512 b687566096f04098bb1df53a3d8e0947e8a0776f847522adf8d05064dd58ef69889a5935dac084cbfd830c9bfcdbf1477aa0f67c11b3d42356d42f5aa7c61190
-EBUILD linux-misc-apps-4.4.ebuild 5526 BLAKE2B 655a698d8931c7980ae8abcc0b650fd3dc38cd8aa5c084a1293848b15533ff63ecc1cd6d6f8930317eb7b116b83da9377d7562108f7a0a20ee949f6beaa263bc SHA512 e53020f00bed7b5913613321905fe46b73ba902c2e8e602bb60752a270febd86f978f8216282b2b3a5abe11159927e57bf4ebfc5145a37609c1125ca64ae3970
+DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
 EBUILD linux-misc-apps-5.6.ebuild 6576 BLAKE2B dd0b82e5853f89d1a29ebaeee407487ecf2db0968ad69a1a4bc11b23ccde9df317fd7e103bc7d483e51b14593cfaade6066982bfcfb45bd9b285b58f3bc0a08a SHA512 cd3d66bbd6933c16b6fbb70cfe619add154202108bbe773aee51a982fc2ea99cecdbffc6cb0ebb17c46ea9a81d88d33ad848b3c60982efd225db0ffc70eefe8d
+EBUILD linux-misc-apps-5.8.ebuild 6525 BLAKE2B ca46c898c235376a5eb2558edc2cea4bf5b9186ad43a7f8446579da36fa3fc0fb640d2686791138750c4cf185dcfa40fe8ac264a19fc594404b37074bab3cfdd SHA512 2e36612df6eebed2fc0129da12daaf9934de30bae0c5ca40eef771aeb5e77df54aa9ec9f843d4382dd8280d3c90e80a54547a6dbac368a8073c80c3057553bf1
 MISC metadata.xml 318 BLAKE2B 87a15c795438a1025ba5624d0c00bfc1e3de3172205b20a4cdb27d5a0d524bc35d1aeb64e58b8c5fadd08d151a82913c35454c36ee5e653da86a6031ab707d24 SHA512 c5b90254b92fd0bd40596718daed1e9b5fd2c0039a814932811e33fb6827eac660aadd324bd45117d60ca56148b2f8213a075be1b255d6e8c006e2702f76833d
diff --git a/sys-apps/linux-misc-apps/files/hpfall.confd b/sys-apps/linux-misc-apps/files/hpfall.confd
deleted file mode 100644
index 4f3451b0bff6..000000000000
--- a/sys-apps/linux-misc-apps/files/hpfall.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/conf.d/hpfall
-
-# The name of the disk device that hpfall should protect.
-# Usually this is 'sda' or 'hda' the primary master.
-
-DISK="sda"
-\ No newline at end of file
diff --git a/sys-apps/linux-misc-apps/files/hpfall.initd b/sys-apps/linux-misc-apps/files/hpfall.initd
deleted file mode 100644
index 8b4930612c4d..000000000000
--- a/sys-apps/linux-misc-apps/files/hpfall.initd
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-checkconfig() {
-    if [ -z "$DISK" ] ; then
-	eerror "You need to setup DISK in /etc/conf.d/hpfall first"
-	return 1
-    fi
-
-    if [ ! -b /dev/${DISK} ]; then
-        eerror "Could not find disk /dev/${DISK}!"
-        eerror "Adjust the DISK setting in /etc/conf.d/hpfall"
-        return 1
-    fi
-
-    if [ ! -e /sys/block/${DISK}/device/unload_heads ] ; then
-        eerror "No protect entry for ${DISK}!"
-        eerror "Kernel 2.6.28 and above is required"
-        return 1
-    fi
-
-    if [ ! -c /dev/freefall ]; then
-        ebegin "Loading hp_accel module"
-        modprobe hp_accel
-        eend $? || return 1
-    fi
-}
-
-start () {
-    checkconfig || return 1
-
-    ebegin "Starting active hard-drive protection daemon"
-    start-stop-daemon --start --quiet \
-        --exec /usr/sbin/hpfall /dev/${DISK}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping active hard-drive protection daemon"
-    start-stop-daemon --stop --quiet \
-        --exec /usr/sbin/hpfall
-    eend $?
-}
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild
deleted file mode 100644
index 4821b1c04c42..000000000000
--- a/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator eutils toolchain-funcs linux-info ltprune flag-o-matic
-
-DESCRIPTION="Misc tools bundled with kernel sources"
-HOMEPAGE="https://kernel.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs tcpd"
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-LINUX_V=$(get_version_component_range 1-2)
-
-if [ ${PV/_rc} != ${PV} ]; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/testing/${LINUX_PATCH}
-		https://www.kernel.org/pub/linux/kernel/v3.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [ $(get_version_component_count) == 4 ]; then
-	# stable-release series
-	LINUX_VER=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_PATCH}"
-else
-	LINUX_VER=${PV}
-fi
-
-LINUX_SOURCES=linux-${LINUX_VER}.tar.xz
-SRC_URI="${SRC_URI} https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_SOURCES}"
-
-# pmtools also provides turbostat
-# usbip available in seperate package now
-RDEPEND="sys-apps/hwids
-		>=dev-libs/glib-2.6
-		tcpd? ( sys-apps/tcp-wrappers )
-		!sys-power/pmtools"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig"
-
-S="${WORKDIR}/linux-${LINUX_VER}"
-
-# All of these are integrated with the kernel build system,
-# No make install, and ideally build with with the root Makefile
-TARGETS_SIMPLE=(
-	Documentation/accounting/getdelays.c
-	Documentation/laptops/dslm.c
-	Documentation/laptops/freefall.c
-	Documentation/networking/timestamping/timestamping.c
-	Documentation/watchdog/src/watchdog-simple.c
-	tools/cgroup/cgroup_event_listener.c
-	tools/lguest/lguest.c
-	tools/vm/slabinfo.c
-	usr/gen_init_cpio.c
-)
-# tools/vm/page-types.c - broken, header path issue
-# tools/hv/hv_kvp_daemon.c - broken in 3.7 by missing linux/hyperv.h userspace
-# Documentation/networking/ifenslave.c - obsolete
-# Documentation/ptp/testptp.c - pending linux-headers-3.0
-
-# These have a broken make install, no DESTDIR
-TARGET_MAKE_SIMPLE=(
-	Documentation/misc-devices/mei:mei-amt-version
-	tools/firewire:nosy-dump
-	tools/power/x86/turbostat:turbostat:../../../../turbostat
-	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
-)
-# tools/perf - covered by dev-utils/perf
-# tools/usb - testcases only
-# tools/virtio - testcaes only
-
-	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
-src_unpack() {
-	unpack ${LINUX_SOURCES}
-
-	MY_A=
-	for _AFILE in ${A}; do
-		[[ ${_AFILE} == ${LINUX_SOURCES} ]] && continue
-		[[ ${_AFILE} == ${LINUX_PATCH} ]] && continue
-		MY_A="${MY_A} ${_AFILE}"
-	done
-	[[ -n ${MY_A} ]] && unpack ${MY_A}
-}
-
-src_prepare() {
-	if [[ -n ${LINUX_PATCH} ]]; then
-		epatch "${DISTDIR}"/${LINUX_PATCH}
-	fi
-
-	sed -i \
-		-e '/^nosy-dump.*LDFLAGS/d' \
-		-e '/^nosy-dump.*CFLAGS/d' \
-		-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
-		"${S}"/tools/firewire/Makefile
-}
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	local karch=$(kernel_asm_arch "${ARCH}")
-	# This is the minimal amount needed to start building host binaries.
-	#emake allmodconfig ARCH=${karch}
-	#emake prepare modules_prepare ARCH=${karch}
-	#touch Module.symvers
-
-	# Now we can start building
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Building $s => $bin"
-		emake -f /dev/null M=${dir} ARCH=${karch} ${s%.c}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target_binfile=${t#*:}
-		target=${target_binfile/:*} binfile=${target_binfile/*:}
-		[ -z "${binfile}" ] && binfile=$target
-		einfo "Building $dir => $binfile (via emake $target)"
-		emake -C $dir ARCH=${karch} $target
-	done
-}
-
-src_install() {
-	into /usr
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Installing $s => $bin"
-		dosbin ${dir}/${bin}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target_binfile=${t#*:}
-		target=${target_binfile/:*} binfile=${target_binfile/*:}
-		[ -z "${binfile}" ] && binfile=$target
-		einfo "Installing $dir => $binfile"
-		dosbin ${dir}/${binfile}
-	done
-
-	newconfd "${FILESDIR}"/freefall.confd freefall
-	newinitd "${FILESDIR}"/freefall.initd freefall
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	echo
-	elog "The cpupower utility is maintained separately at sys-power/cpupower"
-	elog "The usbip utility is maintained separately at net-misc/usbip"
-	elog "The hpfall tool has been renamed by upstream to freefall; update your config if needed"
-	if find /etc/runlevels/ -name hpfall ; then
-		ewarn "You must change hpfall to freefall in your runlevels!"
-	fi
-}
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-3.6-r2.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-3.6-r2.ebuild
deleted file mode 100644
index 4d1f8227e84b..000000000000
--- a/sys-apps/linux-misc-apps/linux-misc-apps-3.6-r2.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator eutils toolchain-funcs linux-info ltprune autotools flag-o-matic
-
-DESCRIPTION="Misc tools bundled with kernel sources"
-HOMEPAGE="https://kernel.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs tcpd"
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-LINUX_V=$(get_version_component_range 1-2)
-
-if [ ${PV/_rc} != ${PV} ]; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.bz2
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
-		https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [ $(get_version_component_count) == 4 ]; then
-	# stable-release series
-	LINUX_VER=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV}.bz2
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
-	LINUX_VER=${PV}
-fi
-
-LINUX_SOURCES=linux-${LINUX_VER}.tar.bz2
-SRC_URI="${SRC_URI} https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-# pmtools also provides turbostat
-# sysfsutils and glib for usbip - remove sysfsutils in 3.7 or 3.8
-RDEPEND="sys-apps/hwids
-		>=sys-fs/sysfsutils-2
-		>=dev-libs/glib-2.6
-		tcpd? ( sys-apps/tcp-wrappers )
-		!sys-power/pmtools
-		!net-misc/usbip"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig"
-
-S="${WORKDIR}/linux-${LINUX_VER}"
-
-# All of these are integrated with the kernel build system,
-# No make install, and ideally build with with the root Makefile
-TARGETS_SIMPLE=(
-	Documentation/accounting/getdelays.c
-	Documentation/cgroups/cgroup_event_listener.c
-	Documentation/laptops/dslm.c
-	Documentation/laptops/hpfall.c
-	Documentation/networking/timestamping/timestamping.c
-	Documentation/watchdog/src/watchdog-simple.c
-	tools/lguest/lguest.c
-	tools/vm/page-types.c
-	tools/vm/slabinfo.c
-	usr/gen_init_cpio.c
-)
-# tools/hv/hv_kvp_daemon.c - broken in 3.7 by missing linux/hyperv.h userspace
-# Documentation/networking/ifenslave.c - obsolete
-# Documentation/ptp/testptp.c - pending linux-headers-3.0
-
-# These have a broken make install, no DESTDIR
-TARGET_MAKE_SIMPLE=(
-	tools/firewire:nosy-dump
-	tools/power/x86/turbostat:turbostat
-	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
-	Documentation/misc-devices/mei:mei-amt-version
-)
-# tools/perf - covered by dev-utils/perf
-# tools/usb - testcases only
-# tools/virtio - testcaes only
-
-	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
-src_unpack() {
-	unpack ${LINUX_SOURCES}
-
-	MY_A=
-	for _AFILE in ${A}; do
-		[[ ${_AFILE} == ${LINUX_SOURCES} ]] && continue
-		[[ ${_AFILE} == ${LINUX_PATCH} ]] && continue
-		MY_A="${MY_A} ${_AFILE}"
-	done
-	[[ -n ${MY_A} ]] && unpack ${MY_A}
-}
-
-src_prepare() {
-	if [[ -n ${LINUX_PATCH} ]]; then
-		epatch "${DISTDIR}"/${LINUX_PATCH}
-	fi
-
-	pushd drivers/staging/usbip/userspace >/dev/null &&
-	eautoreconf -i -f -v &&
-	popd >/dev/null || die "usbip"
-
-	sed -i \
-		-e '/^nosy-dump.*LDFLAGS/d' \
-		-e '/^nosy-dump.*CFLAGS/d' \
-		-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
-		"${S}"/tools/firewire/Makefile
-}
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-src_configure() {
-	cd drivers/staging/usbip/userspace && \
-	econf \
-		$(use_enable static-libs static) \
-		$(use tcpd || echo --without-tcp-wrappers) \
-		--with-usbids-dir=/usr/share/misc
-}
-
-src_compile() {
-	local karch=$(kernel_asm_arch "${ARCH}")
-	# This is the minimal amount needed to start building host binaries.
-	#emake allmodconfig ARCH=${karch}
-	#emake prepare modules_prepare ARCH=${karch}
-	#touch Module.symvers
-
-	# Now we can start building
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Building $s => $bin"
-		emake -f /dev/null M=${dir} ARCH=${karch} ${s%.c}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target=${t/*:}
-		einfo "Building $dir => $target"
-		emake -C $dir ARCH=${karch} $target
-	done
-
-	emake -C drivers/staging/usbip/userspace
-}
-
-src_install() {
-	into /usr
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Installing $s => $bin"
-		dosbin ${dir}/${bin}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target=${t/*:}
-		einfo "Installing $dir => $target"
-		dosbin ${dir}/${target}
-	done
-
-	pushd drivers/staging/usbip/userspace >/dev/null \
-		|| die "Missing usbip/userspace"
-	emake DESTDIR="${D}" install
-
-	newdoc README README.usbip
-	newdoc AUTHORS AUTHORS.usbip
-	dodoc ../usbip_protocol.txt
-	popd >/dev/null
-
-	newconfd "${FILESDIR}"/hpfall.confd hpfall
-	newinitd "${FILESDIR}"/hpfall.initd hpfall
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	echo
-	elog "The cpupower utility is maintained separately at sys-power/cpupower"
-}
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-4.4-r1.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-4.4-r1.ebuild
deleted file mode 100644
index c1ed756f4430..000000000000
--- a/sys-apps/linux-misc-apps/linux-misc-apps-4.4-r1.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator eutils toolchain-funcs linux-info ltprune autotools flag-o-matic
-
-DESCRIPTION="Misc tools bundled with kernel sources"
-HOMEPAGE="https://kernel.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs tcpd usbip"
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-LINUX_V=$(get_version_component_range 1-2)
-
-if [ ${PV/_rc} != ${PV} ]; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/testing/${LINUX_PATCH}
-		https://www.kernel.org/pub/linux/kernel/v3.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [ $(get_version_component_count) == 4 ]; then
-	# stable-release series
-	LINUX_VER=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_PATCH}"
-else
-	LINUX_VER=${PV}
-fi
-
-LINUX_SOURCES=linux-${LINUX_VER}.tar.xz
-SRC_URI="${SRC_URI} https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_SOURCES}"
-
-# pmtools also provides turbostat
-# usbip available in seperate package now
-RDEPEND="sys-apps/hwids
-		>=dev-libs/glib-2.6
-		>=sys-kernel/linux-headers-$(get_version_component_range 1-2)
-		usbip? (
-			!net-misc/usbip
-			tcpd? ( sys-apps/tcp-wrappers )
-			virtual/libudev
-		)
-		!sys-power/pmtools"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig"
-
-S="${WORKDIR}/linux-${LINUX_VER}"
-
-# All of these are integrated with the kernel build system,
-# No make install, and ideally build with with the root Makefile
-TARGETS_SIMPLE=(
-	Documentation/accounting/getdelays.c
-	Documentation/laptops/dslm.c
-	Documentation/networking/timestamping/timestamping.c
-	Documentation/watchdog/src/watchdog-simple.c
-	tools/cgroup/cgroup_event_listener.c
-	tools/laptop/freefall/freefall.c
-	tools/vm/slabinfo.c
-	usr/gen_init_cpio.c
-	# Broken:
-	#tools/lguest/lguest.c # fails to compile
-	#tools/vm/page-types.c # page-types.c:(.text+0xe2b): undefined reference to `debugfs__mount', not defined anywhere
-	#tools/net/bpf_jit_disasm.c # /usr/include/x86_64-pc-linux-gnu/bfd.h:35:2: error: #error config.h must be included before this header
-)
-# tools/vm/page-types.c - broken, header path issue
-# tools/hv/hv_kvp_daemon.c - broken in 3.7 by missing linux/hyperv.h userspace
-# Documentation/networking/ifenslave.c - obsolete
-# Documentation/ptp/testptp.c - pending linux-headers-3.0
-
-# These have a broken make install, no DESTDIR
-TARGET_MAKE_SIMPLE=(
-	Documentation/misc-devices/mei:mei-amt-version
-	tools/firewire:nosy-dump
-	tools/iio:generic_buffer
-	tools/iio:iio_event_monitor
-	tools/iio:lsiio
-	tools/power/x86/turbostat:turbostat
-	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
-	tools/thermal/tmon:tmon
-)
-# tools/perf - covered by dev-utils/perf
-# tools/usb - testcases only
-# tools/virtio - testcaes only
-
-	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
-src_unpack() {
-	unpack ${LINUX_SOURCES}
-
-	MY_A=
-	for _AFILE in ${A}; do
-		[[ ${_AFILE} == ${LINUX_SOURCES} ]] && continue
-		[[ ${_AFILE} == ${LINUX_PATCH} ]] && continue
-		MY_A="${MY_A} ${_AFILE}"
-	done
-	[[ -n ${MY_A} ]] && unpack ${MY_A}
-}
-
-src_prepare() {
-	if [[ -n ${LINUX_PATCH} ]]; then
-		epatch "${DISTDIR}"/${LINUX_PATCH}
-	fi
-
-	pushd tools/usb/usbip/ >/dev/null &&
-	sed -i 's/-Werror[^ ]* //g' configure.ac &&
-	eautoreconf -i -f -v &&
-	popd >/dev/null || die "usbip"
-
-	sed -i \
-		-e '/^nosy-dump.*LDFLAGS/d' \
-		-e '/^nosy-dump.*CFLAGS/d' \
-		-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
-		"${S}"/tools/firewire/Makefile
-}
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-src_configure() {
-	if use usbip; then
-		pushd tools/usb/usbip/ || die
-		econf \
-			$(use_enable static-libs static) \
-			$(use tcpd || echo --without-tcp-wrappers) \
-			--with-usbids-dir=/usr/share/misc
-		popd
-	fi
-}
-
-src_compile() {
-	local karch=$(kernel_asm_arch "${ARCH}")
-	# This is the minimal amount needed to start building host binaries.
-	#emake allmodconfig ARCH=${karch}
-	#emake prepare modules_prepare ARCH=${karch}
-	#touch Module.symvers
-
-	# Now we can start building
-	append-cflags -I./tools/lib
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Building $s => $bin"
-		emake -f /dev/null M=${dir} ARCH=${karch} ${s%.c}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target_binfile=${t#*:}
-		target=${target_binfile/:*} binfile=${target_binfile/*:}
-		[ -z "${binfile}" ] && binfile=$target
-		einfo "Building $dir => $binfile (via emake $target)"
-		emake -C $dir ARCH=${karch} $target
-	done
-
-	if use usbip; then
-		emake -C tools/usb/usbip
-	fi
-}
-
-src_install() {
-	into /usr
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Installing $s => $bin"
-		dosbin ${dir}/${bin}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target_binfile=${t#*:}
-		target=${target_binfile/:*} binfile=${target_binfile/*:}
-		[ -z "${binfile}" ] && binfile=$target
-		einfo "Installing $dir => $binfile"
-		dosbin ${dir}/${binfile}
-	done
-
-	if use usbip; then
-		pushd tools/usb/usbip/ >/dev/null || die "usbip"
-		emake DESTDIR="${D}" install
-		newdoc README README.usbip
-		newdoc AUTHORS AUTHORS.usbip
-		popd >/dev/null
-		dodoc drivers/usb/usbip/usbip_protocol.txt
-	fi
-
-	mv -f "${D}"/usr/sbin/{,iio_}generic_buffer
-
-	newconfd "${FILESDIR}"/freefall.confd freefall
-	newinitd "${FILESDIR}"/freefall.initd freefall
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	echo
-	elog "The cpupower utility is maintained separately at sys-power/cpupower"
-	elog "The lguest utility no longer builds, and has been dropped."
-	elog "The hpfall tool has been renamed by upstream to freefall; update your config if needed"
-	if find /etc/runlevels/ -name hpfall ; then
-		ewarn "You must change hpfall to freefall in your runlevels!"
-	fi
-	if use usbip; then
-		elog "For using USB/IP you need to enable USBIP_VHCI_HCD in the client"
-		elog "machine's kernel config and USBIP_HOST on the server."
-	fi
-}
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-4.4.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-4.4.ebuild
deleted file mode 100644
index ad1f27593bf9..000000000000
--- a/sys-apps/linux-misc-apps/linux-misc-apps-4.4.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator eutils toolchain-funcs linux-info ltprune flag-o-matic
-
-DESCRIPTION="Misc tools bundled with kernel sources"
-HOMEPAGE="https://kernel.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs tcpd"
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-LINUX_V=$(get_version_component_range 1-2)
-
-if [ ${PV/_rc} != ${PV} ]; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/testing/${LINUX_PATCH}
-		https://www.kernel.org/pub/linux/kernel/v3.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [ $(get_version_component_count) == 4 ]; then
-	# stable-release series
-	LINUX_VER=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_PATCH}"
-else
-	LINUX_VER=${PV}
-fi
-
-LINUX_SOURCES=linux-${LINUX_VER}.tar.xz
-SRC_URI="${SRC_URI} https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_SOURCES}"
-
-# pmtools also provides turbostat
-# usbip available in seperate package now
-RDEPEND="sys-apps/hwids
-		>=dev-libs/glib-2.6
-		tcpd? ( sys-apps/tcp-wrappers )
-		!sys-power/pmtools"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig"
-
-S="${WORKDIR}/linux-${LINUX_VER}"
-
-# All of these are integrated with the kernel build system,
-# No make install, and ideally build with with the root Makefile
-TARGETS_SIMPLE=(
-	Documentation/accounting/getdelays.c
-	Documentation/laptops/dslm.c
-	Documentation/networking/timestamping/timestamping.c
-	Documentation/watchdog/src/watchdog-simple.c
-	tools/cgroup/cgroup_event_listener.c
-	tools/laptop/freefall/freefall.c
-	tools/vm/slabinfo.c
-	usr/gen_init_cpio.c
-	# Broken:
-	#tools/lguest/lguest.c # fails to compile
-	#tools/vm/page-types.c # page-types.c:(.text+0xe2b): undefined reference to `debugfs__mount', not defined anywhere
-	#tools/net/bpf_jit_disasm.c # /usr/include/x86_64-pc-linux-gnu/bfd.h:35:2: error: #error config.h must be included before this header
-)
-# tools/vm/page-types.c - broken, header path issue
-# tools/hv/hv_kvp_daemon.c - broken in 3.7 by missing linux/hyperv.h userspace
-# Documentation/networking/ifenslave.c - obsolete
-# Documentation/ptp/testptp.c - pending linux-headers-3.0
-
-# These have a broken make install, no DESTDIR
-TARGET_MAKE_SIMPLE=(
-	Documentation/misc-devices/mei:mei-amt-version
-	tools/firewire:nosy-dump
-	tools/iio:generic_buffer
-	tools/iio:iio_event_monitor
-	tools/iio:lsiio
-	tools/power/x86/turbostat:turbostat
-	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
-	tools/thermal/tmon:tmon
-)
-# tools/perf - covered by dev-utils/perf
-# tools/usb - testcases only
-# tools/virtio - testcaes only
-
-	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
-src_unpack() {
-	unpack ${LINUX_SOURCES}
-
-	MY_A=
-	for _AFILE in ${A}; do
-		[[ ${_AFILE} == ${LINUX_SOURCES} ]] && continue
-		[[ ${_AFILE} == ${LINUX_PATCH} ]] && continue
-		MY_A="${MY_A} ${_AFILE}"
-	done
-	[[ -n ${MY_A} ]] && unpack ${MY_A}
-}
-
-src_prepare() {
-	if [[ -n ${LINUX_PATCH} ]]; then
-		epatch "${DISTDIR}"/${LINUX_PATCH}
-	fi
-
-	sed -i \
-		-e '/^nosy-dump.*LDFLAGS/d' \
-		-e '/^nosy-dump.*CFLAGS/d' \
-		-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
-		"${S}"/tools/firewire/Makefile
-}
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	local karch=$(kernel_asm_arch "${ARCH}")
-	# This is the minimal amount needed to start building host binaries.
-	#emake allmodconfig ARCH=${karch}
-	#emake prepare modules_prepare ARCH=${karch}
-	#touch Module.symvers
-
-	# Now we can start building
-	append-cflags -I./tools/lib
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Building $s => $bin"
-		emake -f /dev/null M=${dir} ARCH=${karch} ${s%.c}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target_binfile=${t#*:}
-		target=${target_binfile/:*} binfile=${target_binfile/*:}
-		[ -z "${binfile}" ] && binfile=$target
-		einfo "Building $dir => $binfile (via emake $target)"
-		emake -C $dir ARCH=${karch} $target
-	done
-}
-
-src_install() {
-	into /usr
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Installing $s => $bin"
-		dosbin ${dir}/${bin}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target_binfile=${t#*:}
-		target=${target_binfile/:*} binfile=${target_binfile/*:}
-		[ -z "${binfile}" ] && binfile=$target
-		einfo "Installing $dir => $binfile"
-		dosbin ${dir}/${binfile}
-	done
-
-	mv -f "${D}"/usr/sbin/{,iio_}generic_buffer
-
-	newconfd "${FILESDIR}"/freefall.confd freefall
-	newinitd "${FILESDIR}"/freefall.initd freefall
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	echo
-	elog "The cpupower utility is maintained separately at sys-power/cpupower"
-	elog "The usbip utility is maintained separately at net-misc/usbip"
-	elog "The lguest utility no longer builds, and has been dropped."
-	elog "The hpfall tool has been renamed by upstream to freefall; update your config if needed"
-	if find /etc/runlevels/ -name hpfall ; then
-		ewarn "You must change hpfall to freefall in your runlevels!"
-	fi
-}
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-4.19.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild
index 45c7b3fd3bb5..c64dce76d292 100644
--- a/sys-apps/linux-misc-apps/linux-misc-apps-4.19.ebuild
+++ b/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit versionator eutils toolchain-funcs linux-info ltprune autotools flag-o-matic
+inherit eutils toolchain-funcs linux-info autotools flag-o-matic
 
 DESCRIPTION="Misc tools bundled with kernel sources"
 HOMEPAGE="https://kernel.org/"
@@ -16,17 +16,22 @@ IUSE="static-libs tcpd usbip"
 MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-pre/-git}"
 
-LINUX_V=$(get_version_component_range 1-2)
+LINUX_V=$(ver_cut 1-2)
+
+get_version_component_count() {
+	local cnt=( $(ver_rs 1- ' ') )
+	echo ${#cnt[@]} || die
+}
 
 if [ ${PV/_rc} != ${PV} ]; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
+	LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+	PATCH_VERSION=$(ver_cut 1-3)
 	LINUX_PATCH=patch-${PV//_/-}.xz
 	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/testing/${LINUX_PATCH}
 		https://www.kernel.org/pub/linux/kernel/v3.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
 elif [ $(get_version_component_count) == 4 ]; then
 	# stable-release series
-	LINUX_VER=$(get_version_component_range 1-3)
+	LINUX_VER=$(ver_cut 1-3)
 	LINUX_PATCH=patch-${PV}.xz
 	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_PATCH}"
 else
@@ -40,7 +45,7 @@ SRC_URI="${SRC_URI} https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_SOURCES
 # usbip available in seperate package now
 RDEPEND="sys-apps/hwids
 		>=dev-libs/glib-2.6
-		>=sys-kernel/linux-headers-$(get_version_component_range 1-2)
+		>=sys-kernel/linux-headers-${LINUX_V}
 		usbip? (
 			!net-misc/usbip
 			tcpd? ( sys-apps/tcp-wrappers )
@@ -59,7 +64,7 @@ TARGETS_SIMPLE=(
 	tools/accounting/getdelays.c
 	tools/cgroup/cgroup_event_listener.c
 	tools/laptop/freefall/freefall.c
-	tools/testing/selftests/networking/timestamping/timestamping.c
+	tools/testing/selftests/net/timestamping.c
 	tools/vm/slabinfo.c
 	usr/gen_init_cpio.c
 	# Broken:
@@ -116,6 +121,8 @@ src_prepare() {
 		-e '/^nosy-dump.*CFLAGS/d' \
 		-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
 		"${S}"/tools/firewire/Makefile
+
+	eapply_user
 }
 
 kernel_asm_arch() {
@@ -191,14 +198,19 @@ src_install() {
 		newdoc README README.usbip
 		newdoc AUTHORS AUTHORS.usbip
 		popd >/dev/null
-		dodoc Documentation/usb/usbip_protocol.txt
+		dodoc Documentation/usb/usbip_protocol.rst
+		find "${D}" -name 'libusbip*.la' -delete || die
 	fi
 
-	mv -f "${D}"/usr/sbin/{,iio_}generic_buffer
+	# At one point upstream it was moved, but be generic to detect if it's
+	# happened already
+	if [[ -f "${D}"/usr/sbin/generic_buffer ]] && \
+		[[ ! -f "${D}"/usr/sbin/iio_generic_buffer ]]; then
+		mv -f "${D}"/usr/sbin/{,iio_}generic_buffer || die
+	fi
 
 	newconfd "${FILESDIR}"/freefall.confd freefall
 	newinitd "${FILESDIR}"/freefall.initd freefall
-	prune_libtool_files
 }
 
 pkg_postinst() {
@@ -206,7 +218,7 @@ pkg_postinst() {
 	elog "The cpupower utility is maintained separately at sys-power/cpupower"
 	elog "The lguest utility no longer builds, and has been dropped."
 	elog "The hpfall tool has been renamed by upstream to freefall; update your config if needed"
-	if find /etc/runlevels/ -name hpfall ; then
+	if find "${ROOT}"/etc/runlevels/ -name hpfall ; then
 		ewarn "You must change hpfall to freefall in your runlevels!"
 	fi
 	if use usbip; then
diff --git a/sys-apps/lmctfy/Manifest b/sys-apps/lmctfy/Manifest
index 2c3d3efb7b7b..b15ceffebf75 100644
--- a/sys-apps/lmctfy/Manifest
+++ b/sys-apps/lmctfy/Manifest
@@ -1,10 +1,3 @@
-DIST lmctfy-0.2.0.tar.gz 2291473 BLAKE2B 1cfa587476215e6cc75f8b31e8c0ff7be342d75d4deee0ddb5d31a8105450aa16b175a2cf876345959aa6bb01249c607b64a551834d7e10b97aeb3f253e05052 SHA512 533990025a9a88e2e2a467e571a80a5b057a0ef3523bfc71c155ad81e6a89463d1e1e094323d5dc875f1b86f4d2d2749819d10b8d6c781e06a93bd37747f12be
-DIST lmctfy-0.3.0.tar.gz 2305226 BLAKE2B 77b0e0c15d46f66fda59da799e37fd37fb70b53b25a13cb0ac3a484bf90ee0e6e4d57e5de13e06954336ca1611db67fe6dfc7a7a8cb9fa6ef7a615209229629f SHA512 9083af2d2b9ea34e6dbb911a24cf7b8a7fe5aa3a0f464d20115db86b5abac530d24122079f97ea2ef98bf4fb20a3980e598d89f38b570ba796665b0af08339d5
-DIST lmctfy-0.3.1.tar.gz 2312481 BLAKE2B 253f177879d85c131c21e2d9e9d2c651e7168ee9d55294014627dd522f3789759db5e8d8c82e189386621a1ada9854922bf0e8525c33f5b237e85c49da51c3c1 SHA512 ab9f2a065a49fae00b540c0592d9356022ba14e0f9dc681731e0757c259f3632a9b34b5fc629eaf2d0943d59e7747af06cfe59a64f447192e8c196a9d41b9522
 DIST lmctfy-0.5.0.tar.gz 2447650 BLAKE2B f40126ccb16b43921e39c23b82ee81a982e97c8bcd7e316568a313e3dd854cc0995f18aba7f6dd48418c3754a3ab92516b2c896136d00006d162044e6f6cd0e6 SHA512 638472b3e8cc98e7ff7ecc48eb0f58fb6a74600db22b7a1962ac3fe137d3549233f3f3b0c97f5783dff6f1851f9c3f9b0607fedea91cb23c1124ed8e2b54aea1
-EBUILD lmctfy-0.2.0.ebuild 774 BLAKE2B 1ba959ab51e1b66cea9d3c7c9567a80092794d55a4c43d65498b3c27be7089866236b95c3defa3a2ad7533b3fc45c850ec8bb5a2d60fe6455b9f8db43f48eed3 SHA512 47be9401ea7fae211b5a53d8b3c5e7e6825d3723730b932b9b9b2092a65a27847c4ed70aa6c6051130baf22199182e5b6903ed47eb3203c00d6aa548a3b0c5ee
-EBUILD lmctfy-0.3.0.ebuild 774 BLAKE2B 1ba959ab51e1b66cea9d3c7c9567a80092794d55a4c43d65498b3c27be7089866236b95c3defa3a2ad7533b3fc45c850ec8bb5a2d60fe6455b9f8db43f48eed3 SHA512 47be9401ea7fae211b5a53d8b3c5e7e6825d3723730b932b9b9b2092a65a27847c4ed70aa6c6051130baf22199182e5b6903ed47eb3203c00d6aa548a3b0c5ee
-EBUILD lmctfy-0.3.1.ebuild 774 BLAKE2B 1ba959ab51e1b66cea9d3c7c9567a80092794d55a4c43d65498b3c27be7089866236b95c3defa3a2ad7533b3fc45c850ec8bb5a2d60fe6455b9f8db43f48eed3 SHA512 47be9401ea7fae211b5a53d8b3c5e7e6825d3723730b932b9b9b2092a65a27847c4ed70aa6c6051130baf22199182e5b6903ed47eb3203c00d6aa548a3b0c5ee
 EBUILD lmctfy-0.5.0-r1.ebuild 757 BLAKE2B f0d2fce9e00442751506b2363824ff67aaf1758639146b8370fcd74aa08280812e317614f6ae73a09f9981c40551897471307ecb56673a34bb9b3d58ade7527b SHA512 7a6d014cd5e6d282cca9e1b3fd8e2b17c02afab6e2226160bfb9a78172443a9e0347a1d6d7834600bf729ccaa9b244931c34541707558ad277f97441af1fd647
-EBUILD lmctfy-0.5.0.ebuild 711 BLAKE2B 10ca9f8c29e157c057350f985b9d613d532be3cf15d115c1c4a149102a34759704bd18f906a6d367e01a9434e7a48455f158e375b4320987f11f73eda1767abc SHA512 784d3db8af701cfc5453509ba919a7b4379596ca6dc357487797ef6deb8cde267e1acaac631b284fb2da7e8bffaf73230934b5d8eec6ee70a9c1f53ed9a89a34
 MISC metadata.xml 335 BLAKE2B ea4fa6ebfc263db5fb52d6f5a30f46799eb5c7488287b7d77ac34a6d791d8e53576424a21b346c67185f293bc689787744287223c43fa8eeee6e5d157bb500e2 SHA512 ae6e68f29f452d34b44b2afb53623f3fe0fdcc76d32d5aa7c5f394cb7f1caad288b320ccf3f1e628a4f42ce8a7f789fd4e8216d07eb539ffec7954632ea68c5c
diff --git a/sys-apps/lmctfy/lmctfy-0.2.0.ebuild b/sys-apps/lmctfy/lmctfy-0.2.0.ebuild
deleted file mode 100644
index a239974b055b..000000000000
--- a/sys-apps/lmctfy/lmctfy-0.2.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Linux application container management from Google"
-HOMEPAGE="https://github.com/google/lmctfy"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/protobuf
-	dev-cpp/gflags
-	dev-libs/re2
-	"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	# test deps take too long to compile
-	use test && emake || emake lmctfy liblmctfy.a
-}
-
-src_install() {
-	# silly upstream!
-	mkdir -p "${D}/usr/bin"
-	cp "${S}/bin/lmctfy/cli/lmctfy" "${D}/usr/bin/" || die "Failed to copy cli binary"
-	dolib.a "${S}/bin/liblmctfy.a"
-}
diff --git a/sys-apps/lmctfy/lmctfy-0.3.0.ebuild b/sys-apps/lmctfy/lmctfy-0.3.0.ebuild
deleted file mode 100644
index a239974b055b..000000000000
--- a/sys-apps/lmctfy/lmctfy-0.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Linux application container management from Google"
-HOMEPAGE="https://github.com/google/lmctfy"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/protobuf
-	dev-cpp/gflags
-	dev-libs/re2
-	"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	# test deps take too long to compile
-	use test && emake || emake lmctfy liblmctfy.a
-}
-
-src_install() {
-	# silly upstream!
-	mkdir -p "${D}/usr/bin"
-	cp "${S}/bin/lmctfy/cli/lmctfy" "${D}/usr/bin/" || die "Failed to copy cli binary"
-	dolib.a "${S}/bin/liblmctfy.a"
-}
diff --git a/sys-apps/lmctfy/lmctfy-0.3.1.ebuild b/sys-apps/lmctfy/lmctfy-0.3.1.ebuild
deleted file mode 100644
index a239974b055b..000000000000
--- a/sys-apps/lmctfy/lmctfy-0.3.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Linux application container management from Google"
-HOMEPAGE="https://github.com/google/lmctfy"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/protobuf
-	dev-cpp/gflags
-	dev-libs/re2
-	"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	# test deps take too long to compile
-	use test && emake || emake lmctfy liblmctfy.a
-}
-
-src_install() {
-	# silly upstream!
-	mkdir -p "${D}/usr/bin"
-	cp "${S}/bin/lmctfy/cli/lmctfy" "${D}/usr/bin/" || die "Failed to copy cli binary"
-	dolib.a "${S}/bin/liblmctfy.a"
-}
diff --git a/sys-apps/lmctfy/lmctfy-0.5.0.ebuild b/sys-apps/lmctfy/lmctfy-0.5.0.ebuild
deleted file mode 100644
index 26f7f25c22ba..000000000000
--- a/sys-apps/lmctfy/lmctfy-0.5.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Linux application container management from Google"
-HOMEPAGE="https://github.com/google/lmctfy"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/protobuf
-	>=dev-cpp/gflags-2.1.1
-	dev-libs/re2
-	dev-lang/go
-	sys-libs/libapparmor
-	"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	# test deps take too long to compile
-	use test && emake || emake lmctfy liblmctfy.a
-}
-
-src_install() {
-	dobin bin/lmctfy/cli/lmctfy
-	dolib.a bin/liblmctfy.a
-}
diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest
index b2204e2f8f9f..b1a52cab9fc4 100644
--- a/sys-apps/opal-utils/Manifest
+++ b/sys-apps/opal-utils/Manifest
@@ -1,9 +1,10 @@
+AUX flags.patch 1057 BLAKE2B 4b601dff49cfe1d82cc32b2fbb0c32922e9f049e010d1403b8986ed5d6e2d8d7c6550c1f08d184327518b71b461aa181b1b4230704dfaa993828c7a2be5d8ce5 SHA512 fd17023c238598472d8e590f2bdff75019c1c6cf76215fa54a15de7089e4f0c89259bdc99fa34147d3dbe2e1572989b6d0814ff99a859635975f627575bc1075
 AUX opal-prd.confd 99 BLAKE2B 105ccd9e2d6d7d51ffc1a82b3fa174ae61ea4e945f679f82460f84bbf2036f4f7f3da2f8d9c66807a275aa98778d824f8ba5d50d1e5349fd17adbee032816290 SHA512 387ec1d00afeaf7c44e4ee5c7e6a3959e1465b7a8a9a121bf470105c23df1f906f23cedbd1006bed250f50a3c3a77f9f40ea62bafa6d6397dda2152c9dedda06
 AUX opal-prd.initd 480 BLAKE2B 895440e30d5a136a717462f8890b3123ca4e31b75f1443f95020e98bf92b0a82f7c0536f828956ea5705c090bb598ab7d48f60653da0eab9bd904e234264ee9e SHA512 9a850a840697bcfeb272dffdabc80be321768fee91808562650d4162555212ce4c6639fd58832979fb710c2f2c78e7835dd99b435b22a64cae9810085d93f459
 DIST opal-utils-6.5.2.tar.gz 2082426 BLAKE2B 20256f13f95da73bcccae670627c9786229e756183fad33ff45ecf2d91f1039c73a0f881b3ac794abad35d51b7bef0b780bd0f8260818c84a262ce7bb0c45b2e SHA512 765e568ad60f5cd7df8868eb3faea841d37c75cb14f33ab30f9419550ea146aeec0d02d622752af1e09a36e744f93be3a56fe6cbc8ac91a94effba9754a24091
 DIST opal-utils-6.6.2.tar.gz 2121790 BLAKE2B 3f1ec80baa112ba0d01fcb9a64b45592da03addd067484ef237204fd712359c04796353f47a32ac943e0e135a580c3c5ad7a5843ee4d5259cde3cbaf1bbefcc4 SHA512 a864e4120ffac4065b89d5da7c959ac20643be42e83f4186a778355f3ea0b36cbd1e02c91b1460b6fa6550fceec9034cce096b89f840b4051d65c7f0ab70dc27
 DIST opal-utils-6.6.3.tar.gz 2121842 BLAKE2B 06ecd73dea54cd8455da32fdd88163c283554e49b380c371705fdba4fef169a1e3022ed4845f33594c0188e11e60f49af1ee0d5062a2e483f0b874e62a567245 SHA512 94af7a389e05627b26a3f79ebdeb55a6bf9e99f530667724c3112df25bc113c9520944a1d8e3847fe7210efa9eed0b8facab95f1f16757ff92038aa7812ce79e
-EBUILD opal-utils-6.5.2.ebuild 2164 BLAKE2B e92b21eeaff806652eda903b2d27c0cdfffcb4a0dfb5ea78d24d4ea92ca1dd0cacd82b8eb2dc864c3e8a6911e60a9ba1a85cf448a83bacee44c6a1fd4b20debc SHA512 2c3bc02aa6fc4b37cf1e27316dec41c8ebf7ae452e6c2a0e6b5450f03e3862d4e8b317ae2d675f5a38fa1d7df4ef3bf59930609c9e09110fab0b30ccc3e4f5d7
-EBUILD opal-utils-6.6.2.ebuild 2607 BLAKE2B b33bc1f76c5401bcb2dfc8cc33daaeea923e54396a8a1cc0ae2b067a7e845b25d16390fc809ff65390d9f46d6f9fd6395adab6aa2c85767beab51d6eff4719ca SHA512 546ac0837649ff8e1e2498adb28ec393cebbf9038ef4bb7280cf74459379db6daf296d22c6d64ff55a8f589b910e280a4e821d487b8c52047e25528008a0e4c7
-EBUILD opal-utils-6.6.3.ebuild 2608 BLAKE2B 518cf78319f1f14f54d74251123c2350887078c1b38b7fad72fb946948c222f3c44b75327df8322f47703c3dd87a45f9ee7b6b1419ae7ea2c982b2fefdd78eed SHA512 0b6ec21cc3596910251160e33f2dedb7e6e5a9c8224c13fd09258279fa174707fc8d40b247d37804c89ccd6befd75637029a947eb0d75ea8a78b19c3586330eb
+EBUILD opal-utils-6.5.2.ebuild 2104 BLAKE2B d8def5a718bdf95bc54c85d3535302c94719cd9792d86264d5aef38964a54d4dd0d3fb01799bc12636d9afcf4098ce1e56c19025fc3569d7df2418e7a537a23b SHA512 ba5ecba2487789b97898a502bc6c4236c683a13c2b4bdc5b3d76a6c1c0e2f35328344a5e1df61d7554606889b4d0314c49bbb1b01b1c2704a16a9401fbbbd5f5
+EBUILD opal-utils-6.6.2.ebuild 2474 BLAKE2B 7d2955ba22d6cd0e9379fdb60d0974e5871f36075b3d64ac37b0f65dcf5b46497c61db105b34ae0a74303798c5fe2eadf8651d2f3179e5c25228ee8d3d849ea3 SHA512 e0481207daf609c9634ca83bba0455ee30b8a70319f62a83ce095273038265ff700da1381b75efa97b4ec52be22d590cc20688ca0bb9179736e9b32cbad6b3aa
+EBUILD opal-utils-6.6.3.ebuild 2475 BLAKE2B 1005100e0c402e42e8c3c866f6284790e2b8a57093f3059b57a6447c0a66b2f6d0673db1cf1e70dd08d51d1d51258620ff29d9500761d69515de3ea916d24cd7 SHA512 98027c446f9537a87a6dbc60f2ef4a5a4f98706f5a89eb8dd25d20b4ec43c90bc5b32733e1bc7dfae11b15365c75509a95ad277bcc9c0b28977bafb2af3bf6a1
 MISC metadata.xml 1099 BLAKE2B 8715aef2781f806a58a094125d7c3ca6189a27a4d4c52ff6286905975a6b688921e09519f9968bb243c216611bab2da6507775c86e5e7293b9412d46ee7713da SHA512 d159348f48be29e96a84845474b1c6286ca29df1d62bec79a1a3385e89be0ac0b84a3465c41e769e447ac5598a189564f5e3e638668ea8c876b6899a1cb33666
diff --git a/sys-apps/opal-utils/files/flags.patch b/sys-apps/opal-utils/files/flags.patch
new file mode 100644
index 000000000000..5aa045ed1ca1
--- /dev/null
+++ b/sys-apps/opal-utils/files/flags.patch
@@ -0,0 +1,35 @@
+From 828c1c28c314c62cf90b9b989f92af7ea96c100d Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sun, 27 Sep 2020 18:48:38 -0700
+Subject: [PATCH] respect user flags
+
+---
+ external/ffspart/rules.mk  | 2 +-
+ external/opal-prd/Makefile | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/external/ffspart/rules.mk b/external/ffspart/rules.mk
+index 40972c6..09a025f 100644
+--- a/external/ffspart/rules.mk
++++ b/external/ffspart/rules.mk
+@@ -30,5 +30,5 @@ $(LIBFLASH_OBJS): libflash-%.o : libflash/%.c
+ 	$(Q_CC)$(CC) $(CFLAGS) -c $< -o $@
+ 
+ $(EXE): $(OBJS)
+-	$(Q_CC)$(CC) $(CFLAGS) $^ -lrt -o $@
++	$(Q_CC)$(CC) $(CFLAGS) $^ -lrt $(LDFLAGS) -o $@
+ 
+diff --git a/external/opal-prd/Makefile b/external/opal-prd/Makefile
+index fb9402f..52f10d9 100644
+--- a/external/opal-prd/Makefile
++++ b/external/opal-prd/Makefile
+@@ -1,5 +1,5 @@
+ # SPDX-License-Identifier: Apache-2.0
+-CFLAGS += -m64 -Werror -Wall -g2 -ggdb
++CFLAGS += -m64 -Wall
+ LDFLAGS += -m64
+ ASFLAGS = -m64
+ CPPFLAGS += -I. -I../../include -I../../
+-- 
+2.28.0
+
diff --git a/sys-apps/opal-utils/opal-utils-6.5.2.ebuild b/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
index 9e12d9fc8b8a..9479de387f7e 100644
--- a/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
@@ -32,6 +32,8 @@ ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils"
 
 S="${WORKDIR}/skiboot-${PV}"
 
+PATCHES=( "${FILESDIR}/flags.patch" )
+
 python_check_deps() {
 	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
 	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
@@ -42,11 +44,6 @@ pkg_setup() {
 	use doc && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	default
-	sed -i '/^CFLAGS +=/ s/-g2 -ggdb//' external/opal-prd/Makefile || die
-}
-
 src_configure() {
 	tc-export CC LD
 	export OPAL_PRD_VERSION="${PV}"
diff --git a/sys-apps/opal-utils/opal-utils-6.6.2.ebuild b/sys-apps/opal-utils/opal-utils-6.6.2.ebuild
index 867857095da6..22d57ef7a346 100644
--- a/sys-apps/opal-utils/opal-utils-6.6.2.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.6.2.ebuild
@@ -32,6 +32,8 @@ ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils"
 
 S="${WORKDIR}/skiboot-${PV}"
 
+PATCHES=( "${FILESDIR}/flags.patch" )
+
 python_check_deps() {
 	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
 	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
@@ -42,12 +44,6 @@ pkg_setup() {
 	use doc && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	default
-	sed -i '/^CFLAGS +=/ s/-g2 -ggdb//' external/opal-prd/Makefile || die
-	sed -i 's/-lrt -o/-lrt $(LDFLAGS) -o/' external/ffspart/rules.mk || die
-}
-
 src_configure() {
 	tc-export CC LD
 	export OPAL_PRD_VERSION="${PV}"
diff --git a/sys-apps/opal-utils/opal-utils-6.6.3.ebuild b/sys-apps/opal-utils/opal-utils-6.6.3.ebuild
index 6f824f28e385..823783f6fa37 100644
--- a/sys-apps/opal-utils/opal-utils-6.6.3.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.6.3.ebuild
@@ -32,6 +32,8 @@ ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils"
 
 S="${WORKDIR}/skiboot-${PV}"
 
+PATCHES=( "${FILESDIR}/flags.patch" )
+
 python_check_deps() {
 	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
 	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
@@ -42,12 +44,6 @@ pkg_setup() {
 	use doc && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	default
-	sed -i '/^CFLAGS +=/ s/-g2 -ggdb//' external/opal-prd/Makefile || die
-	sed -i 's/-lrt -o/-lrt $(LDFLAGS) -o/' external/ffspart/rules.mk || die
-}
-
 src_configure() {
 	tc-export CC LD
 	export OPAL_PRD_VERSION="${PV}"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 4de3f975d6ae..970db73ec183 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,11 +3,9 @@ AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906
 DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f SHA512 6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88
 DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
 DIST portage-3.0.4.tar.bz2 1042654 BLAKE2B 6f869b2eb24f9e590bf8e01172050105a1bd9ea88657db5893133b4620231a0ddcda871d6fcc10623f7f2ef809116310c76355263819be6c3734b0ca184d5fc0 SHA512 7a0c39cd4ed65aebd84ff8bbadba29760b3aa392a0d606c5b29a1112fd0845c42f74eebb0728a069b2b097a6eb7eec2d18af615fd9edcc38f1018ae6ff686812
-DIST portage-3.0.7.tar.bz2 1045185 BLAKE2B 1fe5e13bbbfaecd1b850b29b17908fb2c2756d559b0583174833672b68a67cfc7e7080334729ee5295b646423ca3925284f42eeace0c0b79d02305a170aed5d9 SHA512 701f6bddb9255d5ac86ed6e73f869124925bafd09f7c2e458376b54aebf030fa7f0d80beda1626350755cc1e8a2b9c2636b3fde1105787f2d2a0f742a73cf5e8
 DIST portage-3.0.8.tar.bz2 1046968 BLAKE2B 662147c37a9e7b81030fadb4d6438b734ee57a9eb9bfcee80991d137a017aa3541565961282ebf8736db71aeb05532ffa139ff3a34a84bc9064cf74427acb666 SHA512 5f97870a11ecca30ffe8f463f87cd16a1edb52b44832c6eaba15cadcfde2b4f7edf963749e45c8043b45b38e53ee210dc913aa2d2432a2bd3928cc27c8765a85
 EBUILD portage-2.3.99-r2.ebuild 8482 BLAKE2B 9880361867a65a42c22b277e46fdf973d32b57679519dcce4728fe3297a6b55990a0cc319e161f3056f33c72979101e9b54168e01ef6a1a2bfdc6a92df042821 SHA512 c04cf3569d920a4e55da0eac94cbf93b5780d9b2eb3afa45c918fbae88c11a0f130aba4370b1897628a0f03fd24dcf573aad03164c4e9a786ec754f96cd0939d
 EBUILD portage-3.0.4-r1.ebuild 8527 BLAKE2B 631108e364ee22d284e334c5c641f4e807375ac75804a7c3099837d94a74f4c41cbbaf6ca365624516f858ee68c07b8551a3c1c9f1950f6352d0186db4bd28c6 SHA512 8ff2a857a31c283408b9d8a6f5d1a984c6299ccd1b7f8eaaff2e3b5f3b1dcc62f32bee8dbc1496a4a75e836f4772f91a295a23facb005d035c337032ed63d6a1
-EBUILD portage-3.0.7.ebuild 8386 BLAKE2B 31a02b0077c892cfa61726a716b5cca2349d731fe6e9480476512ad62e457c4b051ab1c0ec236f02728e6955f6f1c45d45c71b8302dd2e35b00cc662dbf2b9cb SHA512 b48ccbf8f975a22b7c61859ca239584c67cd0bc6bc718b2191ee66daabebb600e10f7e0bd5328b0fb3aba5077095fa823d824bb82f5b7dd944f6e319a005241d
 EBUILD portage-3.0.8.ebuild 8386 BLAKE2B 31a02b0077c892cfa61726a716b5cca2349d731fe6e9480476512ad62e457c4b051ab1c0ec236f02728e6955f6f1c45d45c71b8302dd2e35b00cc662dbf2b9cb SHA512 b48ccbf8f975a22b7c61859ca239584c67cd0bc6bc718b2191ee66daabebb600e10f7e0bd5328b0fb3aba5077095fa823d824bb82f5b7dd944f6e319a005241d
 EBUILD portage-9999.ebuild 7417 BLAKE2B 088bcba17cd3d8451e04fa5a2a5e71ea237cd976b9cabbe157822e14b58bf283e628227c1807d5eed2f88699476f312745540bbb5c15ab25089844d4436f9e71 SHA512 bb43ac625afdd22f52cf5d4c45be1512ee56d14cb4ded2cc0c0680d22869836290a09ac09e88967d3e54b6ffd21e0dd429c8cc7f64431617f11e6645d396a020
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
diff --git a/sys-apps/portage/portage-3.0.7.ebuild b/sys-apps/portage/portage-3.0.7.ebuild
deleted file mode 100644
index 28cd3d04cca0..000000000000
--- a/sys-apps/portage/portage-3.0.7.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{6..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="
-	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 \
-		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/prctl/Manifest b/sys-apps/prctl/Manifest
index 41f6771c40b0..d3dbc936fe1b 100644
--- a/sys-apps/prctl/Manifest
+++ b/sys-apps/prctl/Manifest
@@ -3,4 +3,4 @@ AUX configure.ac 200 BLAKE2B 3ec747f56bb304484671171dd61c72cac8b264563955b7759b0
 AUX prctl-1.6-no-implicits.patch 381 BLAKE2B 4374744647de591232e9da6398465a5b9f31f75027f57ce7da5d2294321c6ee17d6bb3c4a108131602bdab7f6643aff2778313c764d659e15093a6cee1081fad SHA512 b01e17872a6c098ddbd4720cf62cd83d485fd1095a9da47c2f79cc09b50648a02bde2aeb38b8dec03d5be794223c898f2c753f576068540252071209e1701812
 DIST prctl-1.6.tar.gz 18876 BLAKE2B 9f26fec1d178141d7e5aa7390dc0403ab1774d711a12588074ee6dbf62c980ab3713179b2f476f20cac0d7e4b027899b144fa67164021dd13b10be3dc087fb2f SHA512 c5b70abbb76f76f4a4c53cebcbd34fa4e87d7db2278a2ea17128da30dea958cc4e4d75b641cb3b9fbd8fa56fee482e97dbae5e61c697e80ef4d13f4b6d28cfda
 EBUILD prctl-1.6-r1.ebuild 545 BLAKE2B d948fc8ac27ed240266ab6eeb805bc65a7ccb07c0a8008e9acd719649cc2380f4ca61dfb658cb40a099bc67a22ee98734d03cecc6c70d9485d2ac0d8353fc304 SHA512 64419216ed7f999f12fd0fe37005cfac90db415b3952abf7a5787e56d2a6ff88d7209280487dd94fc7a37236d11f70c3a4f6700f1bea416d575b2039dfc7f96b
-MISC metadata.xml 449 BLAKE2B da01afb0a080790cad07f77c097cc92bad6fca77c6d8da75b21e35eb9f1253153bb90bdff9aa719bb77a0c1e760dbb2c60d8152c9d2de15e37fd41fd2edcda80 SHA512 a254e2fa6263298f6f35967195a6f27ea434767c5690082df42e09f3bbb2439835643cfa4d030a09fd5a1829086ebadd6c5485cd53c49ed0ebf291e897f9290f
+MISC metadata.xml 326 BLAKE2B 0133c9224a3685844700784a04d8fd4a9bc5ff6f98213e84bc2d3e12efb8d68dbbc9cbb250c058fed38a903b75bbe908459db58dee9b6725479b8289277aa450 SHA512 bc575ce8fb40e554f52ed9a0154b9d5952538d6703d45a2b7bed559c452458e2bd57cd057771c8db351665f9737dbd1de95471e4cd2884505241514938bb5ffe
diff --git a/sys-apps/prctl/metadata.xml b/sys-apps/prctl/metadata.xml
index 370c6384288c..5dd84ef1cd45 100644
--- a/sys-apps/prctl/metadata.xml
+++ b/sys-apps/prctl/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ia64@gentoo.org</email>
-		<name>Gentoo Linux IA-64 Development</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 6025f7c46ce0..e5aeb31d3a81 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -18,7 +18,7 @@ DIST rng-tools-6.7.tar.gz 52792 BLAKE2B 3789aa4c6e2f024dcaef6b9b51521e206d65500a
 DIST rng-tools-6.8.tar.gz 53769 BLAKE2B 2a10a5639c5b1f4506b2c2cfb0185d16b5b604bd8aae72ca616b121f2e7624ff1ba00eb32daa3626b00d89f106356924bde511e263ab8978ff764757b44588ea SHA512 8fa47c2f0f8ebe6ac13025fa2c74505528b503c4e126c5d02b939797d6d4a8c9fc2b345353e48e497e32c1620a0821431e70752a9eb8ecb71960f16713696b62
 DIST rng-tools-6.9.tar.gz 54426 BLAKE2B b798f8d052b5f13a2847edbe5fc4c7f189433cecac97537193afab09cd35a89d8ddde16708f45f474997ea926bf47b2c6950f03ae7d7d93e559f22ed9fbbabc3 SHA512 08d0b19c309331fd2a2cfb5523a980d5ab1a2e727d06e2b3ecc8851aa94b6fffe9021714f33b5bd1eeb8e6a1d28ab865845520d8e4c96ab3f63019718c08ae7b
 EBUILD rng-tools-5-r2.ebuild 1146 BLAKE2B 0fb06c8208399d1f4fee01b53ab112af78c6b4214b2c9caebd5f22c94d3de062cbc869ea207bc47bee48a11a4892ce94543972274042e5ce1f2b1cb153b33ef1 SHA512 7eb055a3cee18b56c845eb05f0a66666a8d108fc059fb0c4e2139251f9fa5f3625f25bf133cf13bcc07cb666b07d29d1b83809825c8fa664df3ea90b571c3fb5
-EBUILD rng-tools-6.10.ebuild 1805 BLAKE2B 9e457384db4a31a3f976edd63ae59096779d5bcf8b251c09163702b9a1f84f9a3fa0ab723a89fdd7be5c08877bc9e8daed07b3a51283f793e3246c81c2787e95 SHA512 a21883792e33821272f94f28f0954a3e6d29242654bc90a2706fb96c6fc038ee8532cac25cd7804fa8eb7c10251f8f6d9f1168cb55249d6ce5dcbb7ecff2acaa
+EBUILD rng-tools-6.10.ebuild 1801 BLAKE2B 80237cc93253b761e5cc1ffd51e7db2f5278716808c5f9a7e3663c5e8c9103dc09d29488d926feace950f90dd67636b735a4970bba8b2a59a96671c5d894c72b SHA512 89bcf0177b784ec633547946c0210651220a4067c542191e7ad09df4d1bb7e1486a379804e99067ec1395c2ddab08c79fb2dea2e95326978dd906a55107ee4ec
 EBUILD rng-tools-6.6-r1.ebuild 1409 BLAKE2B 20dfe5ef85122bd102a654c3ef95ae651c18116721d0b42478269cc6e3941c449081325149337a215dc6e250296d298d21ac4eaa8052b53b2055451b777c803f SHA512 91710d9bc23534b1e4930a24ab609816838938ab54e4627748c6eab5c36a615ba6baa681fc46dff9bd15c0b75e6cf181f1383528e14bbd811106d23d55153492
 EBUILD rng-tools-6.7-r1.ebuild 2143 BLAKE2B 0a0da05d43c4763da8c42c1d5ed39287878fd1c24dafe7d37f4002bb6bd08293ba0fa80189210a19a83ab5c5c6914a0e0205d497f1f88d59f2cea997ceb00eb4 SHA512 14e9cd49419ba51d6df5be4134f6bae33aae463a6e19faa6220023f1ba80c9d971c442ae52ca248d85828eb395fa60e5ae41fb95d85e4364b15e99709d36a286
 EBUILD rng-tools-6.7-r2.ebuild 2173 BLAKE2B 01fb210ba3b0ed8b5f40ceb061b7e31c4f14de6ffef6af18d4c25519646776bdc66cab8c376b91cd057588a64e5b1377a0fca52d033174bbc6f77f59edac7e49 SHA512 cf9e07fc1ee37c37cd5de5b08e62aab692f83593ceeca0131edafa621a4acf61f9661851c230c5a7ded13796b99266fedeca97827c4e35ba26c301602e8d4a1d
diff --git a/sys-apps/rng-tools/rng-tools-6.10.ebuild b/sys-apps/rng-tools/rng-tools-6.10.ebuild
index 730669867d71..18d6153431a1 100644
--- a/sys-apps/rng-tools/rng-tools-6.10.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
 IUSE="jitterentropy nistbeacon pkcs11 selinux"
 
 DEPEND="
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 2375f65c2c13..fc6573ee14a4 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,5 +1,3 @@
-AUX 245-clang-gnu11.patch 3167 BLAKE2B 4d254ae7ffc906d282580805a041ac2c11552ff6e7569cc06709faf6fe0894d9c9856ba54783e141341c512a401428390f7233050921e5e045b867f7e517f298 SHA512 6261c71cb4afbbbe5189f7ac01bf7cc50139edca4175f6f821941e012f5f4335835eef518e187996612e174159947a4fc2fec70fdbb16c8cdfa82369c7f4c814
-AUX 245-libmicrohttpd-0.9.71.patch 2545 BLAKE2B f07b4181e4ee2dafa7b6801ea266b135aa82e1c52521cd03f36305667b412fbbdbb7b03f597e0a9840d89453fb12e348d16069b06db448b3e000fdbbe4c51110 SHA512 f161e2d28f22bfd720c3dae5af163aa9ed88c7d9a052d5e7c9b47fcc09041a762ec4ffd4c41041e1ff03cdf1558877d37022216f91e8b6ee53bfd77494109357
 AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0
 AUX gentoo-generator-path-r1.patch 1037 BLAKE2B 5eb80521a6726c9b4693f9b0f56d3e68fca1a49f5f5eb5a1576329d30c93d2fe7c121920099d74962eacf7ed1d3747250f103a57e4be246320a99871521a3b6a SHA512 1b0d1c2f96cb4aa95adfa5940efaeb2bd940110720399358317906d21d08b0caf625474980e101bba001afd626f8ad64367b09b40bec0b2d46b977021c4adfc5
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
@@ -8,12 +6,8 @@ AUX gentoo-systemctl-disable-sysv-sync.patch 784 BLAKE2B b2a1a931e1fa0c41d5610db
 AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
-DIST systemd-stable-244.3.tar.gz 8484735 BLAKE2B 25125ecdae59c852e8ceb45b7ed0b76631b301ab4026c4e389c4bc12090fe41f5918411a75bd20f38b6b3993445df93c850ba98f8d9b30fd24fc4e25f8355a3d SHA512 f8e83fa3e57ac8fdbed61b66bb45fd0eafa6fb36eda26f10690d93f34b03daab6ce4e7eff45b79dcaf59f11f41c1b022d1d9314f576c50ad28f6bb5901f1b18d
-DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d SHA512 47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172
 DIST systemd-stable-245.7.tar.gz 9171465 BLAKE2B 77117360155ef6358244a382ebd521fe180d8dd982cc2edda18790105933cd5e8880030572eb50d5405b9afdab519b06e0721f48c57394d3d1043a123169ccb1 SHA512 306b3a9cd1d8985a05be259f8a08efb5e9f7102a657eccdef58e082822b61a6e82246dc4f3b6e0bd33eedbd550af54e0029af9d0d2b70416e27626ec43921449
-EBUILD systemd-244.3.ebuild 14561 BLAKE2B f7361cfed800988cd2d2ff70eadc3f75c15d7d1a3d12a9934574abd9c4b948207d69f25aa6326b3c90cc17274e80d70ba74c23361acc7a1b2749a25752f4db49 SHA512 4f08e146c380e8b14fa449ef11c8c33ddab8e358e7cb8efe7e39b6b2858828824405b70c223097a3dba3ceb06a2efc47cd957e2c0d5afdc2d620ad558f161c3c
-EBUILD systemd-245.5.ebuild 15237 BLAKE2B 7b1931325551b46fe73ebfbe29b3dbfb466cbb638fc58e7f3c182554ad9f53c7c8d904ec903e20abe0ab9721167c27d8b14726eec5616ed7891880a0153d45ab SHA512 8f5759721f9f76f2a7a0514adb7de7479debabd1d88c48b8fd3b05d99be8cc458bc48f175e8baef0834c7bc439009428b17f0e9fd11f4cf6e25c54eecd80fbcc
-EBUILD systemd-245.7-r1.ebuild 15125 BLAKE2B 74edf57a9af4b7543be0a28846ede00d87f482a6b337eef0a4a9d7f038d8a42ba1c028978c4de86f3cc9a235247f5a8ffbd225aa1d2beb8e830e6373128fcfe3 SHA512 5c552dcf93a1b158e05c981aa036ec9b26ec5f454bd446aefcb61e87bd0a10893dd2e019409956262cd90d073d3dac46d8785e93452f5b4ba367a53807481dd8
-EBUILD systemd-246-r1.ebuild 15132 BLAKE2B 6ae118e2c2dafc000f7c076cd39f6dc29f94723eedbcf26422ab914e78f1b96f421958e9e067b55559c32a18ad9abe8b2a3f8f7f831cfd312c73a3c3ee2b8d2a SHA512 6930805067f4c884a816b12d82e877ff94a458a1286cec5c7a3cf64fd3db0f7a2da949a39f3821d85b8f3603a8b29f2d5276437522a8eb420790500f62dc30bc
-EBUILD systemd-9999.ebuild 15132 BLAKE2B 6ae118e2c2dafc000f7c076cd39f6dc29f94723eedbcf26422ab914e78f1b96f421958e9e067b55559c32a18ad9abe8b2a3f8f7f831cfd312c73a3c3ee2b8d2a SHA512 6930805067f4c884a816b12d82e877ff94a458a1286cec5c7a3cf64fd3db0f7a2da949a39f3821d85b8f3603a8b29f2d5276437522a8eb420790500f62dc30bc
+EBUILD systemd-245.7-r1.ebuild 15134 BLAKE2B fba59139460f4ed9f099f2024cd9c7a16d888b746716897979a39118fcd474f1ca75542b743c076403aa65a55e914b4a5d9a929934d31530e2c19fd4fd256f6e SHA512 f1ab5ba4a327ac0edfbe592d11c9fc258aa5b62f46ca300d50843c9c43bed2e7f2b25faf9e894f061e968e66db036b7e7275e9e9956ed3ea3cf48750aa0fa134
+EBUILD systemd-246-r1.ebuild 15141 BLAKE2B 838868efa4e6978443e71703408c82b4d9356515c5d9eb1e8ae60062fb62c91a34f197605080fef8460be39c9e15e74cfd637306f6fa0cb30b0a6645df4ad76e SHA512 c03d81855fc53e344c0698dbcacbee7b8d32f890a981c4b00b931171b531c41270544b762d452cc1bd31f1385797194271b9fc55d85d60940b83941c620367e1
+EBUILD systemd-9999.ebuild 15141 BLAKE2B 838868efa4e6978443e71703408c82b4d9356515c5d9eb1e8ae60062fb62c91a34f197605080fef8460be39c9e15e74cfd637306f6fa0cb30b0a6645df4ad76e SHA512 c03d81855fc53e344c0698dbcacbee7b8d32f890a981c4b00b931171b531c41270544b762d452cc1bd31f1385797194271b9fc55d85d60940b83941c620367e1
 MISC metadata.xml 2373 BLAKE2B fac7a9db4c217998f84bcbb5bc490eee748a35f9d991962d5aa21c6ec562d494af06b67fe35879ee2b245445d22ea7eadc4db6305215f393c4565b86665b3130 SHA512 e2d999684255f6c6509af7dca1b9e1411eac9a4cde6f30d9631c5b9d2bbe749a40f3d08c067d2cad5eb1cdd8ad823c3afb6844cc5e3c1d455fbd8cd20d87a696
diff --git a/sys-apps/systemd/files/245-clang-gnu11.patch b/sys-apps/systemd/files/245-clang-gnu11.patch
deleted file mode 100644
index 9056b56d48ee..000000000000
--- a/sys-apps/systemd/files/245-clang-gnu11.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 36e0d89a88c51ba879a2d7e2f90ea9b38333e2c0 Mon Sep 17 00:00:00 2001
-From: Denis Pronin <dannftk@yandex.ru>
-Date: Sun, 8 Mar 2020 23:57:07 +0300
-Subject: [PATCH] Support compiling with clang and gnu11 standard
-
-Signed-off-by: Denis Pronin <dannftk@yandex.ru>
----
- src/shared/json-internal.h | 35 ++++++++++++++++++++++++-----------
- 1 file changed, 24 insertions(+), 11 deletions(-)
-
-diff --git a/src/shared/json-internal.h b/src/shared/json-internal.h
-index bf158bff0d4..fabff0c860e 100644
---- a/src/shared/json-internal.h
-+++ b/src/shared/json-internal.h
-@@ -26,21 +26,34 @@ assert_cc(sizeof(JsonValue) == 16U);
- /* We use fake JsonVariant objects for some special values, in order to avoid memory allocations for them. Note that
-  * effectively this means that there are multiple ways to encode the same objects: via these magic values or as
-  * properly allocated JsonVariant. We convert between both on-the-fly as necessary. */
--#define JSON_VARIANT_MAGIC_TRUE ((JsonVariant*) 1)
--#define JSON_VARIANT_MAGIC_FALSE ((JsonVariant*) 2)
--#define JSON_VARIANT_MAGIC_NULL ((JsonVariant*) 3)
--#define JSON_VARIANT_MAGIC_ZERO_INTEGER ((JsonVariant*) 4)
--#define JSON_VARIANT_MAGIC_ZERO_UNSIGNED ((JsonVariant*) 5)
--#define JSON_VARIANT_MAGIC_ZERO_REAL ((JsonVariant*) 6)
--#define JSON_VARIANT_MAGIC_EMPTY_STRING ((JsonVariant*) 7)
--#define JSON_VARIANT_MAGIC_EMPTY_ARRAY ((JsonVariant*) 8)
--#define JSON_VARIANT_MAGIC_EMPTY_OBJECT ((JsonVariant*) 9)
--#define _JSON_VARIANT_MAGIC_MAX ((JsonVariant*) 10)
-+enum
-+{
-+ _JSON_VARIANT_MAGIC_TRUE = 1,
-+#define JSON_VARIANT_MAGIC_TRUE ((JsonVariant*) _JSON_VARIANT_MAGIC_TRUE)
-+ _JSON_VARIANT_MAGIC_FALSE,
-+#define JSON_VARIANT_MAGIC_FALSE ((JsonVariant*) _JSON_VARIANT_MAGIC_FALSE)
-+ _JSON_VARIANT_MAGIC_NULL,
-+#define JSON_VARIANT_MAGIC_NULL ((JsonVariant*) _JSON_VARIANT_MAGIC_NULL)
-+ _JSON_VARIANT_MAGIC_ZERO_INTEGER,
-+#define JSON_VARIANT_MAGIC_ZERO_INTEGER ((JsonVariant*) _JSON_VARIANT_MAGIC_ZERO_INTEGER)
-+ _JSON_VARIANT_MAGIC_ZERO_UNSIGNED,
-+#define JSON_VARIANT_MAGIC_ZERO_UNSIGNED ((JsonVariant*) _JSON_VARIANT_MAGIC_ZERO_UNSIGNED)
-+ _JSON_VARIANT_MAGIC_ZERO_REAL,
-+#define JSON_VARIANT_MAGIC_ZERO_REAL ((JsonVariant*) _JSON_VARIANT_MAGIC_ZERO_REAL)
-+ _JSON_VARIANT_MAGIC_EMPTY_STRING,
-+#define JSON_VARIANT_MAGIC_EMPTY_STRING ((JsonVariant*) _JSON_VARIANT_MAGIC_EMPTY_STRING)
-+ _JSON_VARIANT_MAGIC_EMPTY_ARRAY,
-+#define JSON_VARIANT_MAGIC_EMPTY_ARRAY ((JsonVariant*) _JSON_VARIANT_MAGIC_EMPTY_ARRAY)
-+ _JSON_VARIANT_MAGIC_EMPTY_OBJECT,
-+#define JSON_VARIANT_MAGIC_EMPTY_OBJECT ((JsonVariant*) _JSON_VARIANT_MAGIC_EMPTY_OBJECT)
-+ __JSON_VARIANT_MAGIC_MAX
-+#define _JSON_VARIANT_MAGIC_MAX ((JsonVariant*) __JSON_VARIANT_MAGIC_MAX)
-+};
- 
- /* This is only safe as long as we don't define more than 4K magic pointers, i.e. the page size of the simplest
-  * architectures we support. That's because we rely on the fact that malloc() will never allocate from the first memory
-  * page, as it is a faulting page for catching NULL pointer dereferences. */
--assert_cc((uintptr_t) _JSON_VARIANT_MAGIC_MAX < 4096U);
-+assert_cc((unsigned) __JSON_VARIANT_MAGIC_MAX < 4096U);
- 
- enum { /* JSON tokens */
-         JSON_TOKEN_END,
diff --git a/sys-apps/systemd/files/245-libmicrohttpd-0.9.71.patch b/sys-apps/systemd/files/245-libmicrohttpd-0.9.71.patch
deleted file mode 100644
index 08affa501700..000000000000
--- a/sys-apps/systemd/files/245-libmicrohttpd-0.9.71.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From d17eabb1052e7c8c432331a7a782845e36164f01 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Tue, 30 Jun 2020 09:56:10 +0200
-Subject: [PATCH] =?UTF-8?q?Fix=20build=20with=20=C2=B5httpd=200.9.71?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The return type of callbacks was changed from int to an enum.
----
- src/journal-remote/journal-gatewayd.c    | 4 ++--
- src/journal-remote/journal-remote-main.c | 2 +-
- src/journal-remote/microhttpd-util.h     | 6 ++++++
- 3 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
-index 5177e0d1577..3ab7c98b0b5 100644
---- a/src/journal-remote/journal-gatewayd.c
-+++ b/src/journal-remote/journal-gatewayd.c
-@@ -349,7 +349,7 @@ static int request_parse_range(
-         return 0;
- }
- 
--static int request_parse_arguments_iterator(
-+static mhd_result request_parse_arguments_iterator(
-                 void *cls,
-                 enum MHD_ValueKind kind,
-                 const char *key,
-@@ -796,7 +796,7 @@ static int request_handler_machine(
-         return MHD_queue_response(connection, MHD_HTTP_OK, response);
- }
- 
--static int request_handler(
-+static mhd_result request_handler(
-                 void *cls,
-                 struct MHD_Connection *connection,
-                 const char *url,
-diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
-index 69a111afead..f82d188a8c6 100644
---- a/src/journal-remote/journal-remote-main.c
-+++ b/src/journal-remote/journal-remote-main.c
-@@ -253,7 +253,7 @@ static int process_http_upload(
-         return mhd_respond(connection, MHD_HTTP_ACCEPTED, "OK.");
- };
- 
--static int request_handler(
-+static mhd_result request_handler(
-                 void *cls,
-                 struct MHD_Connection *connection,
-                 const char *url,
-diff --git a/src/journal-remote/microhttpd-util.h b/src/journal-remote/microhttpd-util.h
-index d90c6bbd4f1..4ca9a5c4f16 100644
---- a/src/journal-remote/microhttpd-util.h
-+++ b/src/journal-remote/microhttpd-util.h
-@@ -47,6 +47,12 @@
- #  define MHD_create_response_from_fd_at_offset64 MHD_create_response_from_fd_at_offset
- #endif
- 
-+#if MHD_VERSION >= 0x00097002
-+#  define mhd_result enum MHD_Result
-+#else
-+#  define mhd_result int
-+#endif
-+
- void microhttpd_logger(void *arg, const char *fmt, va_list ap) _printf_(2, 0);
- 
- /* respond_oom() must be usable with return, hence this form. */
diff --git a/sys-apps/systemd/systemd-244.3.ebuild b/sys-apps/systemd/systemd-244.3.ebuild
deleted file mode 100644
index 7a177b4f0528..000000000000
--- a/sys-apps/systemd/systemd-244.3.ebuild
+++ /dev/null
@@ -1,507 +0,0 @@
-# Copyright 2011-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	MY_P=${MY_PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-	curl? ( net-misc/curl:0= )
-	dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
-		>=net-libs/gnutls-3.1.4:0=
-	)
-	idn? ( net-dns/libidn2:= )
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
-	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
-	pcre? ( dev-libs/libpcre2 )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	acct-group/adm
-	acct-group/wheel
-	acct-group/kmem
-	acct-group/tty
-	acct-group/utmp
-	acct-group/audio
-	acct-group/cdrom
-	acct-group/dialout
-	acct-group/disk
-	acct-group/input
-	acct-group/kvm
-	acct-group/render
-	acct-group/tape
-	acct-group/video
-	acct-group/systemd-journal
-	acct-user/systemd-journal-remote
-	acct-user/systemd-coredump
-	acct-user/systemd-network
-	acct-user/systemd-resolve
-	acct-user/systemd-timesync
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	sysv-utils? ( !sys-apps/sysvinit )
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-auth/nss-myhostname
-	!sys-fs/eudev
-	!sys-fs/udev
-"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-apps/hwids-20150417[udev]
-	>=sys-fs/udev-init-scripts-25
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	sys-devel/m4
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-		"${FILESDIR}/245-clang-gnu11.patch"
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/gentoo-systemd-user-pam.patch"
-			"${FILESDIR}/gentoo-generator-path-r1.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-meson_use() {
-	usex "$1" true false
-}
-
-meson_multilib() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dsupport-url="https://gentoo.org/support/"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
-		-Dsplit-usr=$(usex split-usr true false)
-		-Dsplit-bin=true
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		-Dsysvinit-path=
-		-Dsysvrcnd-path=
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Dima=true
-		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
-		# Optional components/dependencies
-		-Dacl=$(meson_multilib_native_use acl)
-		-Dapparmor=$(meson_multilib_native_use apparmor)
-		-Daudit=$(meson_multilib_native_use audit)
-		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
-		-Dlibcurl=$(meson_multilib_native_use curl)
-		-Ddns-over-tls=$(meson_multilib_native_use dns-over-tls)
-		-Delfutils=$(meson_multilib_native_use elfutils)
-		-Dgcrypt=$(meson_use gcrypt)
-		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		-Dmicrohttpd=$(meson_multilib_native_use http)
-		-Didn=$(meson_multilib_native_use idn)
-		-Dimportd=$(meson_multilib_native_use importd)
-		-Dbzip2=$(meson_multilib_native_use importd)
-		-Dzlib=$(meson_multilib_native_use importd)
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dlz4=$(meson_use lz4)
-		-Dxz=$(meson_use lzma)
-		-Dlibiptc=$(meson_multilib_native_use nat)
-		-Dpam=$(meson_use pam)
-		-Dpcre2=$(meson_multilib_native_use pcre)
-		-Dpolkit=$(meson_multilib_native_use policykit)
-		-Dqrencode=$(meson_multilib_native_use qrcode)
-		-Dseccomp=$(meson_multilib_native_use seccomp)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		-Ddbus=$(meson_multilib_native_use test)
-		-Dxkbcommon=$(meson_multilib_native_use xkb)
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-		-Dcreate-log-dirs=false
-
-		# multilib options
-		-Dbacklight=$(meson_multilib)
-		-Dbinfmt=$(meson_multilib)
-		-Dcoredump=$(meson_multilib)
-		-Denvironment-d=$(meson_multilib)
-		-Dfirstboot=$(meson_multilib)
-		-Dhibernate=$(meson_multilib)
-		-Dhostnamed=$(meson_multilib)
-		-Dhwdb=$(meson_multilib)
-		-Dldconfig=$(meson_multilib)
-		-Dlocaled=$(meson_multilib)
-		-Dman=$(meson_multilib)
-		-Dnetworkd=$(meson_multilib)
-		-Dquotacheck=$(meson_multilib)
-		-Drandomseed=$(meson_multilib)
-		-Drfkill=$(meson_multilib)
-		-Dsysusers=$(meson_multilib)
-		-Dtimedated=$(meson_multilib)
-		-Dtimesyncd=$(meson_multilib)
-		-Dtmpfiles=$(meson_multilib)
-		-Dvconsole=$(meson_multilib)
-
-		# static-libs
-		-Dstatic-libsystemd=$(usex static-libs true false)
-		-Dstatic-libudev=$(usex static-libs true false)
-	)
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	meson_src_test
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-	fi
-
-	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rm "${ED}"/usr/share/man/man1/init.1 || die
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/kernel/install.d
-	keepdir /etc/systemd/{network,system,user}
-	keepdir /etc/udev/{hwdb.d,rules.d}
-	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
-	keepdir /usr/lib/{binfmt.d,modules-load.d}
-	keepdir /usr/lib/systemd/user-generators
-	keepdir /var/lib/systemd
-	keepdir /var/log/journal
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-	rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-
-	gen_usr_ldscript -a systemd udev
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-save_enabled_units() {
-	ENABLED_UNITS=()
-	type systemctl &>/dev/null || return
-	for x; do
-		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
-			ENABLED_UNITS+=( "${x}" )
-		fi
-	done
-}
-
-pkg_preinst() {
-	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
-
-	if ! use split-usr; then
-		local dir
-		for dir in bin sbin lib; do
-			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
-				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
-				eerror "One of them should be a symbolic link to the other one."
-				FAIL=1
-			fi
-		done
-		if [[ ${FAIL} ]]; then
-			eerror "Migration to system layout with merged directories must be performed before"
-			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
-			die "System layout with split directories still used"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${EROOT}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	systemd_reenable systemd-networkd.service systemd-resolved.service
-
-	if [[ ${ENABLED_UNITS[@]} ]]; then
-		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if type systemctl &>/dev/null; then
-			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
-		fi
-		elog "To enable a useful set of services, run the following:"
-		elog "  systemctl preset-all --preset-mode=enable-only"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
-		ebegin "Reexecuting system manager"
-		systemctl daemon-reexec
-		eend $?
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-245.5.ebuild b/sys-apps/systemd/systemd-245.5.ebuild
deleted file mode 100644
index ce5b95342570..000000000000
--- a/sys-apps/systemd/systemd-245.5.ebuild
+++ /dev/null
@@ -1,529 +0,0 @@
-# Copyright 2011-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	MY_P=${MY_PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"
-
-REQUIRED_USE="
-	homed? ( cryptsetup )
-	importd? ( curl gcrypt lzma )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-	curl? ( net-misc/curl:0= )
-	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	homed? ( ${OPENSSL_DEP} )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
-		>=net-libs/gnutls-3.1.4:0=
-	)
-	idn? ( net-dns/libidn2:= )
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
-	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( app-crypt/p11-kit:0= )
-	pcre? ( dev-libs/libpcre2 )
-	pwquality? ( dev-libs/libpwquality:0= )
-	qrcode? ( media-gfx/qrencode:0= )
-	repart? ( ${OPENSSL_DEP} )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	acct-group/adm
-	acct-group/wheel
-	acct-group/kmem
-	acct-group/tty
-	acct-group/utmp
-	acct-group/audio
-	acct-group/cdrom
-	acct-group/dialout
-	acct-group/disk
-	acct-group/input
-	acct-group/kvm
-	acct-group/render
-	acct-group/tape
-	acct-group/video
-	acct-group/systemd-journal
-	acct-user/systemd-journal-remote
-	acct-user/systemd-coredump
-	acct-user/systemd-network
-	acct-user/systemd-resolve
-	acct-user/systemd-timesync
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	sysv-utils? ( !sys-apps/sysvinit )
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-auth/nss-myhostname
-	!sys-fs/eudev
-	!sys-fs/udev
-"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	hwdb? ( >=sys-apps/hwids-20150417[udev] )
-	>=sys-fs/udev-init-scripts-25
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	sys-devel/m4
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-		"${FILESDIR}/245-libmicrohttpd-0.9.71.patch"
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/gentoo-systemd-user-pam.patch"
-			"${FILESDIR}/gentoo-generator-path-r1.patch"
-			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-meson_use() {
-	usex "$1" true false
-}
-
-meson_multilib() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dsupport-url="https://gentoo.org/support/"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
-		-Dsplit-usr=$(usex split-usr true false)
-		-Dsplit-bin=true
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Dima=true
-		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
-		# Optional components/dependencies
-		-Dacl=$(meson_multilib_native_use acl)
-		-Dapparmor=$(meson_multilib_native_use apparmor)
-		-Daudit=$(meson_multilib_native_use audit)
-		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
-		-Dlibcurl=$(meson_multilib_native_use curl)
-		-Ddns-over-tls=$(meson_multilib_native_use dns-over-tls)
-		-Delfutils=$(meson_multilib_native_use elfutils)
-		-Dgcrypt=$(meson_use gcrypt)
-		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		-Dhomed=$(meson_multilib_native_use homed)
-		-Dhwdb=$(meson_multilib_native_use hwdb)
-		-Dmicrohttpd=$(meson_multilib_native_use http)
-		-Didn=$(meson_multilib_native_use idn)
-		-Dimportd=$(meson_multilib_native_use importd)
-		-Dbzip2=$(meson_multilib_native_use importd)
-		-Dzlib=$(meson_multilib_native_use importd)
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dlz4=$(meson_use lz4)
-		-Dxz=$(meson_use lzma)
-		-Dlibiptc=$(meson_multilib_native_use nat)
-		-Dpam=$(meson_use pam)
-		-Dp11kit=$(meson_multilib_native_use pkcs11)
-		-Dpcre2=$(meson_multilib_native_use pcre)
-		-Dpolkit=$(meson_multilib_native_use policykit)
-		-Dpwquality=$(meson_multilib_native_use pwquality)
-		-Dqrencode=$(meson_multilib_native_use qrcode)
-		-Drepart=$(meson_multilib_native_use repart)
-		-Dseccomp=$(meson_multilib_native_use seccomp)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		-Ddbus=$(meson_multilib_native_use test)
-		-Dxkbcommon=$(meson_multilib_native_use xkb)
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-		-Dcreate-log-dirs=false
-
-		# multilib options
-		-Dbacklight=$(meson_multilib)
-		-Dbinfmt=$(meson_multilib)
-		-Dcoredump=$(meson_multilib)
-		-Denvironment-d=$(meson_multilib)
-		-Dfirstboot=$(meson_multilib)
-		-Dhibernate=$(meson_multilib)
-		-Dhostnamed=$(meson_multilib)
-		-Dldconfig=$(meson_multilib)
-		-Dlocaled=$(meson_multilib)
-		-Dman=$(meson_multilib)
-		-Dnetworkd=$(meson_multilib)
-		-Dquotacheck=$(meson_multilib)
-		-Drandomseed=$(meson_multilib)
-		-Drfkill=$(meson_multilib)
-		-Dsysusers=$(meson_multilib)
-		-Dtimedated=$(meson_multilib)
-		-Dtimesyncd=$(meson_multilib)
-		-Dtmpfiles=$(meson_multilib)
-		-Dvconsole=$(meson_multilib)
-
-		# static-libs
-		-Dstatic-libsystemd=$(usex static-libs true false)
-		-Dstatic-libudev=$(usex static-libs true false)
-	)
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	meson_src_test
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-	fi
-
-	rm "${ED}"/etc/init.d/README || die
-	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
-
-	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rm "${ED}"/usr/share/man/man1/init.1 || die
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/kernel/install.d
-	keepdir /etc/systemd/{network,system,user}
-	keepdir /etc/udev/rules.d
-
-	if use hwdb; then
-		keepdir /etc/udev/hwdb.d
-	fi
-
-	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
-	keepdir /usr/lib/{binfmt.d,modules-load.d}
-	keepdir /usr/lib/systemd/user-generators
-	keepdir /var/lib/systemd
-	keepdir /var/log/journal
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-	if use hwdb; then
-		rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
-	fi
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-
-	gen_usr_ldscript -a systemd udev
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-save_enabled_units() {
-	ENABLED_UNITS=()
-	type systemctl &>/dev/null || return
-	for x; do
-		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
-			ENABLED_UNITS+=( "${x}" )
-		fi
-	done
-}
-
-pkg_preinst() {
-	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
-
-	if ! use split-usr; then
-		local dir
-		for dir in bin sbin lib; do
-			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
-				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
-				eerror "One of them should be a symbolic link to the other one."
-				FAIL=1
-			fi
-		done
-		if [[ ${FAIL} ]]; then
-			eerror "Migration to system layout with merged directories must be performed before"
-			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
-			die "System layout with split directories still used"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${EROOT}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	systemd_reenable systemd-networkd.service systemd-resolved.service
-
-	if [[ ${ENABLED_UNITS[@]} ]]; then
-		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if type systemctl &>/dev/null; then
-			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
-		fi
-		elog "To enable a useful set of services, run the following:"
-		elog "  systemctl preset-all --preset-mode=enable-only"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
-		ebegin "Reexecuting system manager"
-		systemctl daemon-reexec
-		eend $?
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-245.7-r1.ebuild b/sys-apps/systemd/systemd-245.7-r1.ebuild
index d709f3514300..31c8fb40c649 100644
--- a/sys-apps/systemd/systemd-245.7-r1.ebuild
+++ b/sys-apps/systemd/systemd-245.7-r1.ebuild
@@ -154,7 +154,7 @@ pkg_pretend() {
 		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
 			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
 			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
 			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
 			~!SYSFS_DEPRECATED_V2"
diff --git a/sys-apps/systemd/systemd-246-r1.ebuild b/sys-apps/systemd/systemd-246-r1.ebuild
index a3cf9676ba5f..e762aa1e4009 100644
--- a/sys-apps/systemd/systemd-246-r1.ebuild
+++ b/sys-apps/systemd/systemd-246-r1.ebuild
@@ -154,7 +154,7 @@ pkg_pretend() {
 		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
 			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
 			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
 			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
 			~!SYSFS_DEPRECATED_V2"
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index a3cf9676ba5f..e762aa1e4009 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -154,7 +154,7 @@ pkg_pretend() {
 		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
 			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
 			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
 			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
 			~!SYSFS_DEPRECATED_V2"
diff --git a/sys-apps/usb_modeswitch/Manifest b/sys-apps/usb_modeswitch/Manifest
index c0219f3d870b..5eb5d959e993 100644
--- a/sys-apps/usb_modeswitch/Manifest
+++ b/sys-apps/usb_modeswitch/Manifest
@@ -1,14 +1,5 @@
 AUX usb_modeswitch.sh-tmpdir.patch 596 BLAKE2B 6198685654131161989e03ac28ec4f4db5a2d8ba57c4f3c4b5c1fe96086c36bf450b4854995d098610faf12f89eaf55a5bcd95f1a68f0f2d2c3956ee92870947 SHA512 45e3a3f78a9404293a8b7e864f22db94a617be1d34d2c91fdaddc9b6a183dee1e3e2b5f4376e417d2c56b13b772a70e5e5cb53d0a08adf4cdbe60f1378abfa1c
-DIST usb-modeswitch-2.2.6.tar.bz2 263395 BLAKE2B d9502bd56b967dd01f878be15cb6ce3dd545321dc5f7a6c813bba250236ce3db71635b9d26d31bde2c2a6ac08a11ac8472aeae92f55b3af2db694aad94f56e5a SHA512 f19b4c88e9a32af55a4a552cf89a2d25343b499180e41fccf988d34613f8480d49b7586b9b123edabc7cdbbb23073678797e99b7b679dd758924c9300377e067
-DIST usb-modeswitch-2.3.0.tar.bz2 263141 BLAKE2B 106d3db684ce1f41b096398e6b46bac64427a86010993a3a6320655f1358e029b21815a8ca4c6818728f6b5fc9f14eac2680985219344396c560681e9f0ce146 SHA512 5b7a012f31612ab53f817132e5055b45c056e5862f6daf9cb910c004878a93a46c0676040ba20323c110bd7fe3d5d26f2e16200ead2411d12f83e03278ff3a6c
-DIST usb-modeswitch-2.4.0.tar.bz2 259433 BLAKE2B 97d57cc100c63078069092a1a1e5057e29ee1d108c37a2f19ad373f793ceb8678dc4da0c810cea7887ea81f24961def6e30ce46d59c6513033b1f60fa4f3f956 SHA512 cf232b8333509012415fe9afbd1becbf54bbf7ebbb6cd450d16546840afc2dbdbc253f8ae6ae294c1e3a490d935e675b984a02ddbe243b57d80443f5d265117c
 DIST usb-modeswitch-2.5.2.tar.bz2 259820 BLAKE2B 263d0b8c4ec79eebb1f79cfd171973f0d6cab96bd361b54c5fed8908745eb4643af935edff788b0913f8ba5ba1edcb683c75aeff6c426437c8436c74f875982b SHA512 ad2a7e5134379664fca83b85803e52ec8e3fe3c2d6c633eb5af3c291c43b15ca4a67198612864de01d146a029ee5c475c8c7dc71d16e3a475b532837c5dd34ea
-DIST usb-modeswitch-data-20151101.tar.bz2 30350 BLAKE2B f9acb91e9f213a405c34349eaa8b0c0d59396eb182128cd96696d547849feeb8ce11f5d77d60f746fd0aa9993a9cc254f7269b376b077b5701a39f44f5319e5e SHA512 416fcf5ca6834b0a7697df4ecdc3ca61c02da7ecd8aff8836b9b8a83be96f9df7fb85ed05befdb6257267875d96ee39ee30affedea9794250f9ea46c1aadd879
-DIST usb-modeswitch-data-20160112.tar.bz2 31166 BLAKE2B c9d036fc836502f3197b456afc9348836208af5ffdea6d8fa79c762a24afea807f41a78243d82a09e56bd0dedd30e633e49e7552ffe56cb685ffacbe2746f0a7 SHA512 2da14d9a6e355921605f5e2231420326bae68b67466907b852c91a4f544101e31bccd703a6ecbae74b69cb518ab86d6732ffcacf4cbeccff55eea5befaedcaa3
-DIST usb-modeswitch-data-20160803.tar.bz2 31943 BLAKE2B 9b43c1a3e72497af1c935a61e0bbb7ad83b4d93619bb3897a5cead81e10572f8a705e7eb052ebde1ac04b85f4a367f07174a94b0828c1143136492fa98fa98cf SHA512 53c9ce700af986463e211fb918a06732df610403c149565c69e2d29ee5b248def7d607b2d10ba46da2b2d0be93803c1279e739b33eb14049520df6d556335608
 DIST usb-modeswitch-data-20170806.tar.bz2 32700 BLAKE2B 954aa513a74774cdabb2e3820fa56f1244de74cbfc0adda5309e4dc3bd79c2b6dd2023a5180f8d39f8b496485e1991de2a7fabbb59f6995fc7e0c0bb0b782243 SHA512 818bc9f3d9b75df245bb25f959075041667607e7681bdbca7006ec036613130a0fa5e41da9e939ca510e524a78a7a76aef82ecfbbe19611887b3735987b951cc
-EBUILD usb_modeswitch-2.2.6.ebuild 1618 BLAKE2B 51965bfe0cd191ce5d2fa04c8a3220b75d223f14743dc6af03d7bdbc4485cc7276e84a244f0ecd778fc0406eb1a1a83a5d3f59512a78129ddd5af7b105df6f9a SHA512 a03aa55c61e9cc2471002230df0c3cca107a993767335d96b4227df1bc0cdfa9bd0bf4effc34b1d2ebe84a5fe3f28bc969189f02fed29536a140914746587295
-EBUILD usb_modeswitch-2.3.0.ebuild 1621 BLAKE2B bd313eea043de7431089b7b485f3f899b719dc77201d43e1e59ff99d2797a7fd150c52a2b92c66e8af29530f126b984b2f7d4d7d7decca0c8aa28439ecb60e44 SHA512 81e79f81d623b0073bd5417ddf4df894dce0c50cc75bd034989bdecaae3b23e2d10ab9fbc8b0558b61e19311ee5de13a2dd6b8a62f2b046b0fcf48795020bad0
-EBUILD usb_modeswitch-2.4.0-r1.ebuild 1674 BLAKE2B 23b53e63eff1c31100688dcf0feef7b0459cb52bc936f989f079b7cbcf779fe2ae77ae2e78f3b72972ffcc7a3c9d32beeb2e68a1f9afa1a6cd0cae6314da82b9 SHA512 fc07e12527a539b102b626525f7cba77ba3beca9b254e1c21d7e8f692a58d09b4e81bce35afa5940402f943f3b60295e43ca3267a903ea23b3d0876e98e1b137
 EBUILD usb_modeswitch-2.5.2.ebuild 1671 BLAKE2B 304ccc0dee0fccac9beaf220e7ef1e6c07c549f197180bae7c6d3ae3ea8d9e64300f4b39387b0d7739e572f5575f3f3826929277c7ee6799f2f3b23bd1cbe343 SHA512 06bc65bb27d68ddb41d994feceb97de8dcaad790fecccfd247993d2bc2d54aeb9a97ba150b7875fd1a78a4f998ec88a3dd61efdeade725c2839b6081d27ec33c
 MISC metadata.xml 419 BLAKE2B b10eae75d3eacc64acd82b38254b85362f2301c6a5c2447f5113dae4d7769a260cf8b7d82c478d0589f05791ffab9651727f24a7709bff3f89d8d8dd0b8bd805 SHA512 6032951cd03029286f34a452c911d977a92cd3eb56c3c588c27d091bb506e1f3f963e87fb262270bc1108aeefeeb4f49b18ab8aaaa38383e35cddb8c5f43b06d
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.2.6.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.2.6.ebuild
deleted file mode 100644
index 341b046c566a..000000000000
--- a/sys-apps/usb_modeswitch/usb_modeswitch-2.2.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info toolchain-funcs udev systemd
-
-MY_PN=${PN/_/-}
-MY_P=${MY_PN}-${PV/_p*}
-#DATA_VER=${PV/*_p}
-DATA_VER="20151101"
-
-DESCRIPTION="A tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
-HOMEPAGE="https://www.draisberghof.de/usb_modeswitch/ https://www.draisberghof.de/usb_modeswitch/device_reference.txt"
-SRC_URI="https://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
-	https://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="jimtcl"
-
-COMMON_DEPEND="
-	virtual/udev
-	virtual/libusb:1
-"
-RDEPEND="${COMMON_DEPEND}
-	jimtcl? ( dev-lang/jimtcl )
-	!jimtcl? ( dev-lang/tcl:0 )" # usb_modeswitch script is tcl
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~USB_SERIAL"
-
-src_prepare() {
-	sed -i -e '/install.*BIN/s:-s::' Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		SYSDIR="${D}/$(systemd_get_unitdir)" \
-		UDEVDIR="${D}/$(get_udevdir)" \
-		$(usex jimtcl install-shared install)
-
-	# Even if we set SYSDIR above, the Makefile is causing automagic detection of `systemctl` binary,
-	# which is why we need to force the .service file to be installed:
-	systemd_dounit ${PN}@.service
-
-	dodoc ChangeLog README
-
-	pushd ../${MY_PN}-data-${DATA_VER} >/dev/null
-	emake \
-		DESTDIR="${D}" \
-		RULESDIR="${D}/$(get_udevdir)/rules.d" \
-		files-install db-install
-	docinto data
-	dodoc ChangeLog README
-	popd >/dev/null
-}
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.3.0.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.3.0.ebuild
deleted file mode 100644
index b2c23bace38d..000000000000
--- a/sys-apps/usb_modeswitch/usb_modeswitch-2.3.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info toolchain-funcs udev systemd
-
-MY_PN=${PN/_/-}
-MY_P=${MY_PN}-${PV/_p*}
-#DATA_VER=${PV/*_p}
-DATA_VER="20160112"
-
-DESCRIPTION="A tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
-HOMEPAGE="https://www.draisberghof.de/usb_modeswitch/ https://www.draisberghof.de/usb_modeswitch/device_reference.txt"
-SRC_URI="https://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
-	https://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="jimtcl"
-
-COMMON_DEPEND="
-	virtual/udev
-	virtual/libusb:1
-"
-RDEPEND="${COMMON_DEPEND}
-	jimtcl? ( dev-lang/jimtcl )
-	!jimtcl? ( dev-lang/tcl:0 )" # usb_modeswitch script is tcl
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~USB_SERIAL"
-
-src_prepare() {
-	sed -i -e '/install.*BIN/s:-s::' Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		SYSDIR="${D}/$(systemd_get_unitdir)" \
-		UDEVDIR="${D}/$(get_udevdir)" \
-		$(usex jimtcl install-shared install)
-
-	# Even if we set SYSDIR above, the Makefile is causing automagic detection of `systemctl` binary,
-	# which is why we need to force the .service file to be installed:
-	systemd_dounit ${PN}@.service
-
-	dodoc ChangeLog README
-
-	pushd ../${MY_PN}-data-${DATA_VER} >/dev/null
-	emake \
-		DESTDIR="${D}" \
-		RULESDIR="${D}/$(get_udevdir)/rules.d" \
-		files-install db-install
-	docinto data
-	dodoc ChangeLog README
-	popd >/dev/null
-}
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.4.0-r1.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.4.0-r1.ebuild
deleted file mode 100644
index 5a862fc779fd..000000000000
--- a/sys-apps/usb_modeswitch/usb_modeswitch-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info toolchain-funcs udev systemd
-
-MY_PN=${PN/_/-}
-MY_P=${MY_PN}-${PV/_p*}
-#DATA_VER=${PV/*_p}
-DATA_VER="20160803"
-
-DESCRIPTION="A tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
-HOMEPAGE="https://www.draisberghof.de/usb_modeswitch/ https://www.draisberghof.de/usb_modeswitch/device_reference.txt"
-SRC_URI="https://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
-	https://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="jimtcl"
-
-COMMON_DEPEND="
-	virtual/udev
-	virtual/libusb:1
-"
-RDEPEND="${COMMON_DEPEND}
-	jimtcl? ( dev-lang/jimtcl )
-	!jimtcl? ( dev-lang/tcl:0 )" # usb_modeswitch script is tcl
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~USB_SERIAL"
-
-src_prepare() {
-	sed -i -e '/install.*BIN/s:-s::' Makefile || die
-	epatch "${FILESDIR}/usb_modeswitch.sh-tmpdir.patch"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		SYSDIR="${D}/$(systemd_get_unitdir)" \
-		UDEVDIR="${D}/$(get_udevdir)" \
-		$(usex jimtcl install-shared install)
-
-	# Even if we set SYSDIR above, the Makefile is causing automagic detection of `systemctl` binary,
-	# which is why we need to force the .service file to be installed:
-	systemd_dounit ${PN}@.service
-
-	dodoc ChangeLog README
-
-	pushd ../${MY_PN}-data-${DATA_VER} >/dev/null
-	emake \
-		DESTDIR="${D}" \
-		RULESDIR="${D}/$(get_udevdir)/rules.d" \
-		files-install db-install
-	docinto data
-	dodoc ChangeLog README
-	popd >/dev/null
-}
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-30 17:27:54 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-30 17:27:54 +0100
commit	f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
tree	e907cb121b30e3c1df1710719c0ddf4029597a47 /sys-apps
parent	db063b515939ab15261136b24e4bc44386335c0c (diff)