gentoo resync : 04.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-04 22:28:33 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-04 22:28:33 +0100
commit: a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch)
tree: 8c764c1cc0576389ce22abd317bceba71ea5732d /sys-apps
parent: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff)
44 files changed, 242 insertions, 677 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index acafb483f623..16f803bc80ba 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/crazydiskinfo/Manifest b/sys-apps/crazydiskinfo/Manifest
index 30f40516c2c8..8bc5cc44ff39 100644
--- a/sys-apps/crazydiskinfo/Manifest
+++ b/sys-apps/crazydiskinfo/Manifest
@@ -1,3 +1,3 @@
 DIST crazydiskinfo-1.1.0.tar.gz 5372 BLAKE2B f00c989b33cff303066b76d8da0bdb8ca12d94598a26f6990706637c0f430d18c3ae9344fcd7ad3e5ff301dac9651c29002548190d06dd16ea99132dbd94c50c SHA512 57e9ea4f8abec18355806da35225132f06a5562b1717e6dca1515043b2a0f2a51b47a2bcda31f1e64d6b2e9c8c6de5445d835f59eed79fd0911e06fd32296803
-EBUILD crazydiskinfo-1.1.0.ebuild 686 BLAKE2B 421eb26810c0e9baa2d8cf0c0e94bafe39b96ff8cbb0b7cc103a527ccb118be9a8d92b9e9f66087b8b7cbac7bcf93acdc310a66ccd82e423ea3b1174ea561948 SHA512 e9dfe1ff7a0d69acf6c600eaa46a28950959954ce51983ffd7893a30cc22554899216ed6be06d42239921f45a6eb85109e2af617a498fcc6cea7afb2d54962ff
+EBUILD crazydiskinfo-1.1.0.ebuild 688 BLAKE2B 000997982a6b31d889d2b43d871c07e425b9fb690131cb97a3d913d22b1478e707a9f42132e0fce26006b005670de76d70e76e5c5c1c92b03001206deb9b8b3c SHA512 7f02a4ca70a341d74572085d827dd6ca74b73229afac150934cc0511b47c172ee62b528c23fb5f48bf1e0bd9a33a121b79bc6333b60e042313ddc1d8f841ac15
 MISC metadata.xml 337 BLAKE2B 5fe18f1ee9170a67a9a9ca06bfe616e201cc206df3ff4db58427188ad6316364fa62552ff84a5002624847f674eb8ad171be0d4b0512593350425737af6774b8 SHA512 d2db95f5443566d3c216dced563587dddaa72d23befc9cc982539b9872c89d0e57a2a633b7a69e7ea0817941736c3c99b0ee61f9b69144043681dbe7a190d9cb
diff --git a/sys-apps/crazydiskinfo/crazydiskinfo-1.1.0.ebuild b/sys-apps/crazydiskinfo/crazydiskinfo-1.1.0.ebuild
index ed033278ff51..0026177e5689 100644
--- a/sys-apps/crazydiskinfo/crazydiskinfo-1.1.0.ebuild
+++ b/sys-apps/crazydiskinfo/crazydiskinfo-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ DEPEND="
 	dev-libs/libatasmart:0=
 	sys-libs/ncurses:0="
 
-RDEPEND="$DEPEND"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	sed -e "s#^set(CMAKE_CXX_FLAGS.*#set(CMAKE_CXX_FLAGS \"${CXXFLAGS} -Wall -std=c++11\")#" \
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index f08cb7884480..3a24500118ee 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -1,11 +1,11 @@
 AUX ethtool-5.8-avoid_bashisms.patch 674 BLAKE2B 75b1fdd5980b91348eed8dbbfae00855e2c7f66e2ef4f95b2c8bc679b7d6759358c4d464825956bbb8ab01773d23af7cbe5bdc98eed856baa4589ac44b2cc172 SHA512 0755b7c05026935762b89ff58c083b4dbcc02227400285b0b64e5421f02c2c9c1fb373c8ba43eabe3d38110898fcdbbf664d6f1aff6e28d33759489339d1262b
 AUX ethtool-5.8-only-memset-non-NULL-link-settings.patch 703 BLAKE2B b5c2dca415555f1aa7411296abc3501a33018290772c14adc2ca5a73ad39e11a62d1033042ad0ab644b141c9438168edb995a2d2f877ce62ad834c26776a6739 SHA512 c6014e931ff2f96f26b5dde6b5ab99ac7592ff4077af15eb8612ded35186c09490ccbd6d4a00bff46e40da5d18a26c2b6d6e6664f581c7c111ff18e2dd6d049f
 DIST ethtool-5.10.tar.xz 310536 BLAKE2B acc91ff2f7cf233a5a7bc85e32fbcf78e3923b240ab3e3300fa11d42769b664b1b5740ad6577daf4ef1b1054432e2323429ee63774af5e0210c1ec1c7d6aa4ac SHA512 128ecc0445ec44e231d95158a71cea2c03f059314f1a844cfb2f424970bd68608fb73b8dc5e8905b88ad0da2b65a8884a626be78d6d25f770ce043c6c87580a6
+DIST ethtool-5.12.tar.xz 311004 BLAKE2B 640d4a1576afea60c673a6060b649d10ccb2d2be64a817e4d74daeb6de4da2d30ccb059ff1113e05f9c44898f08beefd706be2ea6e323c42032c4d93926d380a SHA512 9825f0bf10851f0bd9c3e621785144a5ed5f3fbedacb1801aa6a9b4685c870fa9bfac8eb552c900d20be06240c017dd001fde6be7aecc8c466bbe9ade8b1d002
 DIST ethtool-5.4.tar.xz 239288 BLAKE2B 8c8b2bee53fe3e71510684ca7c6f64153cb6f1c5ebe44cd4d1dc351885d2d9957eb206a96bda9efadb5faa0e15a3f0ba07923d7e29b27694e3e3f605151a940d SHA512 c7bfe7eae2ba207d710716274e9f5ae275c57d0bebc0a9acb95677125e64f1b42ef610032011fb59894aab46973988bad40fddbc5ccc238893e7da66f913255b
 DIST ethtool-5.8.tar.xz 299416 BLAKE2B ea7433205eba831b6ba56e140c73cfe283cc5dc56ced963414a017b0d6b6fbde9d0195ff64ebdc060351e5e9844af8beb8f00f7e04d76b04f958b166cda7e589 SHA512 5eada909f82573ad93bc5476e6f8d50f68ce2c9948558877eb6ace8dc17aee895b2f27343592f5f23eaef0e0fc70b5f776f76e75d9614bab305a2819ca82370e
-DIST ethtool-5.9.tar.xz 307792 BLAKE2B 0cb5b56f6367bba18c92b1d420471be0b203e05d36fec1495f18de7a2e793fb12cd57b3f2f79369327be1b76a9ec749a65b91801c90da79de9d23da62e628fcb SHA512 9166a06b823373188e754b3085cf8e8f71455d83d1bcfcaf1350433b21bdbc6ae851f62108d3d2e3bbbca33ca595382cd2c68966ce4824b55f7f59eb0996bf36
-EBUILD ethtool-5.10.ebuild 591 BLAKE2B b5c8ee339ab24f7738596a35ce897d6ccdac5819e659375b3986997c05f6cb7e87ba1c904775bc59aa00c96d95889a81f65999ad79893b2dbf3fe28eed0ca057 SHA512 b2eceda29fe07143e041ab129af00320a7e9001cf3e9b432fcf784137ad21297a1332e5a7619034ce0a8a0ee1b76d3cfd0af7178eb0d34ca6d0594f3c0580381
+EBUILD ethtool-5.10.ebuild 585 BLAKE2B 8388f5cdf04e2743c427f019344d38c26ea96ea13a2ab718d03fa11a181011036515d504094050b876a1a138251af16b67af28cd5722d763c00a2f0c08b83d29 SHA512 fe44358eb30bd1ed1c2d4095b714dcd669bde7da248e002fa09bb4d3e1240f91b117a39a7a3450576350dca6c8af808238e283cbe156140f1e81c894174da30e
+EBUILD ethtool-5.12.ebuild 591 BLAKE2B b5c8ee339ab24f7738596a35ce897d6ccdac5819e659375b3986997c05f6cb7e87ba1c904775bc59aa00c96d95889a81f65999ad79893b2dbf3fe28eed0ca057 SHA512 b2eceda29fe07143e041ab129af00320a7e9001cf3e9b432fcf784137ad21297a1332e5a7619034ce0a8a0ee1b76d3cfd0af7178eb0d34ca6d0594f3c0580381
 EBUILD ethtool-5.4.ebuild 459 BLAKE2B 10c7df1a3e8df3cc1d1d2eabb54fd33fb1d59bc99486aaf5b1545bf62c663e5f4544b24e8bf7776fc9f92aacff48f2a86b38f4de80d98d4d8702e63f4be2b939 SHA512 bee519fea3dd8981660009d6a40c004d168a0fe9c06a7f45ff9a9cb757fc44889741fcc8df6ba97feefdea5961a44ab338344d51cc3bf6e85fc71b080c19cbbe
 EBUILD ethtool-5.8-r1.ebuild 704 BLAKE2B 7d5dd8bc5702829eacf956bb324dc8002ea9caf9e4f7d62df11fbf47d60dadf15b1f99c0802b4364c54f6ac6a2e387928a0ed4da28252692984156516f877a0f SHA512 2ed3b6e06e2dfcc4d76c58f7b4db449298bb43fdaa3223efe38db27ddf630af690fe19886e4ac6a472b9e31d868d44940df3d268926edb9066e65baefcd32fb3
-EBUILD ethtool-5.9.ebuild 591 BLAKE2B b5c8ee339ab24f7738596a35ce897d6ccdac5819e659375b3986997c05f6cb7e87ba1c904775bc59aa00c96d95889a81f65999ad79893b2dbf3fe28eed0ca057 SHA512 b2eceda29fe07143e041ab129af00320a7e9001cf3e9b432fcf784137ad21297a1332e5a7619034ce0a8a0ee1b76d3cfd0af7178eb0d34ca6d0594f3c0580381
 MISC metadata.xml 992 BLAKE2B e549f4afab6b9e4642ccbf9b14f95e7182f6b2d8a9bb0913a30372ea1ff0be92e7a119e708741932ba90183bdd40d2bc314f980e61437b974a6ae590f3598186 SHA512 73a3fe59ca21626b769dc63e428761d33c9796fce642e2da48805a8d4ad59b103a3c7a6a1b17788bfed35ed79fc1e4adad265a16676cb03df0e19e6a6615a69b
diff --git a/sys-apps/ethtool/ethtool-5.10.ebuild b/sys-apps/ethtool/ethtool-5.10.ebuild
index b9870d909410..f3c8b5406ccc 100644
--- a/sys-apps/ethtool/ethtool-5.10.ebuild
+++ b/sys-apps/ethtool/ethtool-5.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="+netlink"
 
 BDEPEND="app-arch/xz-utils"
diff --git a/sys-apps/ethtool/ethtool-5.9.ebuild b/sys-apps/ethtool/ethtool-5.12.ebuild
index b9870d909410..b9870d909410 100644
--- a/sys-apps/ethtool/ethtool-5.9.ebuild
+++ b/sys-apps/ethtool/ethtool-5.12.ebuild
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 042d862d9041..ff1a5488025c 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-disk-utility-3.38.2.tar.xz 1375128 BLAKE2B e437eead1273bb2931462ac6c7a7dfea75c603c5325af003d403f4b5130b28e95496724c1939e5dd2e3c8b517eb0d3cdf51952299451546b41f9f5eaddcf9e63 SHA512 3afc0a40e82f0ab3608302af3d83acb15a758581122188125f9572e95a802359d1af0a1e99fb0cd8fb612413aac09e3d33404d08a2d5e189b79d4f284c92cb82
 DIST gnome-disk-utility-40.0.tar.xz 1386880 BLAKE2B 680057797dc820197adbb3a8dea53c9545343ef03037d22ac3f3f87f34a0727d02c2b602a5886006e30acf97a1c1358258ff6f947be2192d835f955020b366cb SHA512 c53e1bef93dc024bc69be60848825f8175841319a2a7b92a75f48432423c5465151536f597c69707ebff37e5bc8e2c96d8a10f0f0e7ebe7cdc961a74841efd80
+DIST gnome-disk-utility-40.1.tar.xz 1387480 BLAKE2B ef3650cadd2f5e264abbf805fa0af1c7e9e30e067c946d91dd879600e2db5b9af83cc8f7990954cd8d859a7456d4054ddb9bcad0ed716a08b848f78dddda98d8 SHA512 be7a298f6ca9afad5dfd420a5ff5386a1e096f7d956339d5528702b2bd2b657dad4b9017b0ae519d13480fe0806fa64fd1c94e2c1136ee00a6b17c7f21a0acf1
 EBUILD gnome-disk-utility-3.38.2.ebuild 1384 BLAKE2B f5e559be1ecd9842ab766d6b4e9e2a69159fd7d5b038773ab9098ea13e8078fd8f8eac9e28fd011335ad010f766b6a9ee7c347003c2fd171eed5d6db03c43dc9 SHA512 8b14526b8fddd184c6bedb70866ed94e04149117b4ae3d024783ebfc775f00fa72a32d03fb0cda7275db784434bca25eaf7df1f619dfd52bc38d79563fbdbd3e
 EBUILD gnome-disk-utility-40.0.ebuild 1417 BLAKE2B 1dac5bf2964ef979ea0b72d13b17f7409bd2558c20909a028aa58cd716bd60063a018d869bd75543f65a28d4724a881b437204f0511d4456e69c4c2e01cdccd0 SHA512 c266092beed51eb7747ec2c4ce6e68b5749a8885f26ea736236b6aeb7c5ad9a436a693eb9af4b8e6c051d7a377f984ef4d13d2a445e6d5581efde84faa65e4ff
+EBUILD gnome-disk-utility-40.1.ebuild 1417 BLAKE2B 1dac5bf2964ef979ea0b72d13b17f7409bd2558c20909a028aa58cd716bd60063a018d869bd75543f65a28d4724a881b437204f0511d4456e69c4c2e01cdccd0 SHA512 c266092beed51eb7747ec2c4ce6e68b5749a8885f26ea736236b6aeb7c5ad9a436a693eb9af4b8e6c051d7a377f984ef4d13d2a445e6d5581efde84faa65e4ff
 MISC metadata.xml 597 BLAKE2B 6a1f81b2d7758158e8469a0544ce2ca45af42d24379391870b55fd97fd6dd963228136329af658851ecead1c14bf5a92658e6fde18223842451a9d85ccd628de SHA512 40904280037c0754d3481458bf024f83382e65122188f8fece8cd361cab57e01dfbc7b85da631b4265aaa6107567e376f4291e9f6e60e5e89bc747908c8e496c
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-40.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-40.1.ebuild
new file mode 100644
index 000000000000..3192512980a0
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-40.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Disk Utility for GNOME using udisks"
+HOMEPAGE="https://wiki.gnome.org/Apps/Disks"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="fat elogind gnome systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	>=media-libs/libdvdread-4.2.0:0=
+	>=dev-libs/glib-2.31:2
+	>=x11-libs/gtk+-3.16.0:3
+	>=media-libs/libcanberra-0.1[gtk3]
+	>=gui-libs/libhandy-1.1.90:1=
+	>=app-arch/xz-utils-5.0.5
+	>=x11-libs/libnotify-0.7:=
+	>=app-crypt/libsecret-0.7
+	>=dev-libs/libpwquality-1.0.0
+	>=sys-fs/udisks-2.7.6:2
+	elogind? ( >=sys-auth/elogind-209 )
+	systemd? ( >=sys-apps/systemd-209:0= )
+"
+RDEPEND="${DEPEND}
+	x11-themes/adwaita-icon-theme
+	fat? ( sys-fs/dosfstools )
+	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
+"
+# libxml2 for xml-stripblanks in gresource
+BDEPEND="
+	dev-libs/libxml2:2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none))
+		$(meson_use gnome gsd_plugin)
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sys-apps/input-utils/Manifest b/sys-apps/input-utils/Manifest
index 606b5eadde22..8417a9fb3347 100644
--- a/sys-apps/input-utils/Manifest
+++ b/sys-apps/input-utils/Manifest
@@ -1,5 +1,3 @@
-DIST input-1.2.tar.gz 22809 BLAKE2B efef0701ccbdd1bf934049bf687f921194d1a4328882b94e7b2844ec55f25c5c2293eb76ff869d7ed44dbf5e8efe3b2ebd0bb5b657b2b411da5ef83b39520db4 SHA512 75a5e2d5b778ae93fb2d29ed7c8b0ec564233a385d88d0fe3a9e5ecd55259f14014bf269c318b5872ddd1379110565d354a1a043eb0a4693c724d52b6ca12173
 DIST input-1.3.tar.gz 23755 BLAKE2B 45a9d138f55677da596298d86e18af5849a81f5cff7397dab028c4939b6b385cc3116fc48bd23844edc36330d0f25456931fb903af9adcdc60aa21d8267cf725 SHA512 4f864301e6b7d40882327b26780db1d9b7e37215cb558653738f93b74ea2781f64676e41a440fbd2659f14bd30640c7af6c709315cce4dcc6a157d80ac2cb60d
-EBUILD input-utils-1.2.ebuild 774 BLAKE2B de46fd6d116c5f14cfbc9970ae083e99fcf1e696eddab2b1692dcb88c98945a76616230856e955dbff23fe027805e53fede8322af5fdbb76506e739cebdb3bc3 SHA512 44318008509ab352105052b4ca7f6a81c0ca8a72bf7e811c94dba207d7fcebbf839337fcaf4b8edd0c81a4051751901c512d8fbe48a8d2ba695355aef87e01f9
 EBUILD input-utils-1.3.ebuild 563 BLAKE2B 1e980e694a0d14be800110e0f21b637c1c21d5ed8b28117332a312c1c52d42b3792b196b82b0726f610075bc0acae1ad8a832010a49b75bf33847ea938c950d0 SHA512 6d5fd990373f6ece92c61e9fee8901ec05ae90dd41bee785dafacae7e7893f442efe18873379460994aa1d1c926c5a9939d0321c4f939fcbe35c5fad255e6a72
 MISC metadata.xml 579 BLAKE2B d49e0ab5401b5894ed919e3f1d5ed066328ea3224c4390298eda52305900302b2ecc80cddaaeef5dd97c262e87006cdf4e3e9287e3b21f54275287739cbb0297 SHA512 91c9d5676036617c6fe240ae29c7d5ebd904bf048802b50d1a5e783dc656b85d7927f81d2955ae5638fd7e0c9789583a6feaba66bd6db8fadb64c247a26dc3af
diff --git a/sys-apps/input-utils/input-utils-1.2.ebuild b/sys-apps/input-utils/input-utils-1.2.ebuild
deleted file mode 100644
index 1589052b4e13..000000000000
--- a/sys-apps/input-utils/input-utils-1.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch
-
-MY_PN="input"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Small collection of linux input layer utils"
-HOMEPAGE="https://www.kraxel.org/blog/linux/input/"
-SRC_URI="https://www.kraxel.org/releases/input/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Ported from Debian
-	#epatch "${FILESDIR}"/input-utils-0.0.1_pre20081014.patch
-	# version check stuff
-	#epatch "${FILESDIR}"/input-utils-0.0.1-protocol-mismatch-fix.patch
-	:
-}
-
-src_install() {
-	make install bindir="${D}"/usr/bin mandir="${D}"/usr/share/man STRIP="" || die "make install failed"
-	dodoc lircd.conf
-	dodoc README
-}
diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index 57279d86e65f..b0525863bff3 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -8,7 +8,7 @@ AUX log_bmc-1.8.18.initd 570 BLAKE2B 7b21b7888f386953c001a635fa4d1fd3b79a1eb9920
 DIST enterprise-numbers.2020-10-21.xz 1426932 BLAKE2B bfe39ceea321ba47cd40eafa67862eb4dfd6dc29b192afb20ad0c908cd93a16b4103c5de64d042df012417c8cadc03000f2b2a00779bcc582a430603cad5f3cf SHA512 4a854a56e8ed51997c320cbfba041d43cb98b14743ef80b67e701942068d3729604abaedb617655a83ca21a7e20ea5a622ede4de317ca492cefd46da784d28f3
 DIST ipmitool-1.8.18_p20201004.tar.gz 638493 BLAKE2B 52f4ec8c82336b88640d1b91fc17af8f2fe0948a5c48c16067867dcad0852168d48bb21fdd99bde7ed957b66df888fd369c909079d1f81c861acd8c7f8dfa6f2 SHA512 8d72eef3584f4d2c86bfe43f70b5d687f3b7bbdf75b8979f7132c5c98b01baae22c336e540c197652187749fc9bb221a92e546b56e5cf2eb5650fad5094e9433
 DIST ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz 3208 BLAKE2B b37a127eff361039b3b810e19dd97f0c395462b658803f56f10f2dd1abbbe92743dc409ce6b83560db15621b7fa7a3c0f989100077893993df18108a082e49d2 SHA512 0f7646a2307ac98425e99dece9d3e3b23026136a97524151efdecc910fb537af41a91702782989046e44163da98610fa05792878473e228b45c16351f6015a45
-EBUILD ipmitool-1.8.18_p20201004-r1.ebuild 4497 BLAKE2B 791b5ba4fb2fce684a72d0622aef615e9e9b5a6ff4e092e3dc46107500208c4eef324e540232dc91e14f94aec4093c0224c504aabd6e371a065a67fb24bc80e8 SHA512 581138a855b3d47a1ca62d57c679f447de738c76406220b4bf3a24e92782e8f64fd029b6c7defa026bd144698c0374f134a0886ec3cdd2d67f7f487087b85add
-EBUILD ipmitool-1.8.18_p20201004-r2.ebuild 6224 BLAKE2B 02409ca6ac3eed979d64377d1c378cf3a2e4c45d63d339b7f1894c942ae0757e059e424cf9a887a5ee6448c622c1550e8a4494aa1f03948fd38fdc785e8e3fdb SHA512 1847fbdfcc4a21cb553a9dd7145c1566eb4288493728187606fe76ecb99dae51cda58e3529a7d446a48b3b99da17e4519d8ff2d1b9e55b5a5b8bd03577942a4d
-EBUILD ipmitool-1.8.18_p20201004-r3.ebuild 6316 BLAKE2B d4d6e2e6a271448489bb6cf61ba56d293a13bbfdd8b842819a45ff83e176532ca38d59d82f20c99280634ba7a43fffa028c5038414a059220a06b5782b6f9d7e SHA512 716266706588d142db36ca1a3bcf368146ca49f93b932727db802c334c4bbe129426e4e865441599eb4bee4023418968b38b60031f66f3548d615181aa7bc9f0
+EBUILD ipmitool-1.8.18_p20201004-r1.ebuild 4437 BLAKE2B ec30d9ba288a863dee4bff988d4b87df64f4cb394810eca9652ce756f1694ccdd92394f65f069df6d2dd493d32049263df2544c9dbe1e68b437ba80f89edb597 SHA512 54cdf7c659697b77bad07e0384bdbc751954fff6b51d466bfb9a2c2738ad9924f0aac4cd7edd139fdc8e1841664470d44ab1b06cac92b3fb24e2e09ae297499d
+EBUILD ipmitool-1.8.18_p20201004-r2.ebuild 6164 BLAKE2B 51d6417bdaa6e5bb0ce21e6fafdae5e3a02bab2ab8445f277336cae43fd7770b0fc0429e78acb9a7df9d96042f01bf7c0a79955a17a48a7ed56c323a54778f4f SHA512 0ef3d4001062709526390afdd9247d23b2d1baabf93e57a54c40bc75b0425ab92ffa9347119158b6b5b7c71a9bc7b36293a8995d3889c848ff1a78c5f15641dd
+EBUILD ipmitool-1.8.18_p20201004-r3.ebuild 6256 BLAKE2B 43343972887efeee8278066fc5c84f4f0486b9822f56147c72780fe2a4d2d1c6735da360e844310b91201204682e4e34cdaa853b8d05b38b66f4c51c7e1d02bf SHA512 43e46bf09c84de695b4030fa699e5bebf833d6cbc597c2a29273d23ad76e01d9dbac5f8d88b294fb96c073f8d048abb64f9fcd8361afc88eff71b4a02ab0ae1e
 MISC metadata.xml 633 BLAKE2B e7fd815396d39f0d1c4aac50925382df6c245fbf3499f67b8d3a7448821aed48894725e468d6c2b724ad7a706ee12b4126f0b6f7c4c32388de6e34e05333b782 SHA512 53ffd0f2970d1d128e9d12247b5ed502bac4b9550029d57b221f2c2fd84d316831bbb8ddb890a1344b171612f890170847a3de02d52857d75c75f1a593cdebb8
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
index de306acb3fb8..47992a4ef83b 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
@@ -27,14 +27,13 @@ SRC_URI+="
 	#http://http.debian.net/debian/pool/main/i/${PN}/${DEBIAN_PF}.tar.xz
 	# https://launchpad.net/ubuntu/+archive/primary/+files/${DEBIAN_PF}.tar.xz
 #IUSE="freeipmi openipmi status"
-IUSE="libressl openbmc openipmi static"
+IUSE="openbmc openipmi static"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 x86"
 LICENSE="BSD"
 
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	openbmc? ( sys-apps/systemd:0= )
 	sys-libs/readline:0="
 DEPEND="${RDEPEND}
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild
index 906eff1c7181..f7c83a27944c 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild
@@ -27,14 +27,13 @@ SRC_URI+="
 	#http://http.debian.net/debian/pool/main/i/${PN}/${DEBIAN_PF}.tar.xz
 	# https://launchpad.net/ubuntu/+archive/primary/+files/${DEBIAN_PF}.tar.xz
 #IUSE="freeipmi openipmi status"
-IUSE="libressl openbmc openipmi static"
+IUSE="openbmc openipmi static"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 LICENSE="BSD"
 
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	openbmc? ( sys-apps/systemd:0= )
 	sys-libs/readline:0="
 DEPEND="${RDEPEND}
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild
index 2e108b64bdd8..3d8308829c5f 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild
@@ -27,14 +27,13 @@ SRC_URI+="
 	#http://http.debian.net/debian/pool/main/i/${PN}/${DEBIAN_PF}.tar.xz
 	# https://launchpad.net/ubuntu/+archive/primary/+files/${DEBIAN_PF}.tar.xz
 #IUSE="freeipmi openipmi status"
-IUSE="libressl openbmc openipmi static"
+IUSE="openbmc openipmi static"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 LICENSE="BSD"
 
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	openbmc? ( sys-apps/systemd:0= )
 	sys-libs/readline:0="
 DEPEND="${RDEPEND}
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 73637fd8ff7c..0c79c3bcb895 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -10,7 +10,7 @@ DIST iproute2-5.10.0.tar.xz 798776 BLAKE2B 8c17e65f03427f45b71dc17b289b272545549
 DIST iproute2-5.11.0.tar.xz 822044 BLAKE2B e52e2334a4f6271a23e9393a3b11fc7e8e070ecff178bda1cf87705a55b59018edc8c28751e4fc6a7d877c19e6da772765afbdc5944800f98bf176513595e5bb SHA512 f592728ec819fc34cba04b1c04275e783aed86084fe31948e1776e6e473c8c1416aaf8101c19b51ddb4044af1cd2157827c0f91546b33badb448466eae9a2fda
 DIST iproute2-5.12.0.tar.xz 835880 BLAKE2B 8e3e1b7188d7ab5014d06d7edaae2cb0c1dc65862999a2ca9f31902256d7f3d166de8a1c76e4e137acce2b445d72ea6850bfec3640d1919cb82351d45dd3e47e SHA512 9249beb67b30ceef178b60b2b61a5e6c45277e747ae4c865e739b7ab84192549e8e94ebaee43c0a87c0291037746ffb6936346245220786e369201ee13d60fac
 DIST iproute2-5.7.0.tar.xz 764436 BLAKE2B 842229730139f8931c4ff3d548fe56c7c86b6bb7be5cc1a7dd896ddce34c039467fb90d0c258cdc91276edc59b9b19f53c39a36c79b54b15a78436b44c595eed SHA512 d5ef68e0eb8e84fbff68c2e7dd4097b9ceb438c928d17ede4130876802dfeafe8bf08d82b4fd39005314e0679c0b261aaa3d6a0a2ff364074a43a043a855a634
-EBUILD iproute2-5.10.0-r1.ebuild 4769 BLAKE2B 076801f62b9a7c70fb66ed5c399a24caa0ba2ca59ea3f021aff2e1373d8b84fa83013498a792d5e44e766e5d23d4a12bf0820e16161f64cf9868a24a8ec5a733 SHA512 ebd299882b533fcc1f7f9f020ff13b31984db86b153c4db6450c4501c82c26e984ef9aa270be068944e0d237c6f74be1f07fb8bd8a2b58085b1c60e6e20dc377
+EBUILD iproute2-5.10.0-r1.ebuild 4764 BLAKE2B 4b9412a19f175d320ac4f1470f333d7f3ccec76f21a74bf8057a48bc59b2dd44eaa1f7d0466d9a791abaaf65ffc1e606e3722b4a82576e5abdee153534defa6c SHA512 455c325154f857be301998bbd0a693f1b3ae865f36e3e90dff9a23cf6e7d41a7c318bd4c4e7fca840571068f84337ef7bb5801ce4036ef1f430cbbab74528425
 EBUILD iproute2-5.11.0.ebuild 4842 BLAKE2B c26d2d8f73d132acea6513632596a74c9da54fe994e1b408ef90e319042a25ca657942e9059e9d2b97851f7d25d9e2c83034145d36792eb408047d6f75cdb2f9 SHA512 281edb2a65ea6ed65661b82a6d4fa100ff44896336d3d8eb5d2c3511cdd0d0dee262599bfbe3531e5d03074782276488ccd6c52e203b4cbdab71f87f7e198ef5
 EBUILD iproute2-5.12.0.ebuild 4867 BLAKE2B 8646b979a436352fd9ef16fda6d8fdfe90600ee3473f0c89ac1999baae5e72f6cd53b94cfa31cd24556c387b24afeb4b67e13c144c4ae3cb634cc8e0d79485c2 SHA512 f1b7a387a9982727b71d7740562114e8b4ebc1be47161b0612a7c556256d7af7f6f83130c9274f3d1d9127df0589f941a52df604c1d324b299ef3e913523e8f0
 EBUILD iproute2-5.7.0.ebuild 4488 BLAKE2B 0ee24f1fbe3cdb8830e216cf2a576338d44201666776272f3c51d4f71eb3899f3bfdc2d65c39bf2ce65c39ab0f9cff5c9edf093e01e898248ed1c7e7bda76333 SHA512 40a60eb833e58b6df996acc1e70f1de952dd17febf8ef38e77a4cf900979d2a32369a454f9fcd083b362967e38d41784cc2228fd7fc1c49c056a6645b4a41f7b
diff --git a/sys-apps/iproute2/iproute2-5.10.0-r1.ebuild b/sys-apps/iproute2/iproute2-5.10.0-r1.ebuild
index cc079e1e1d94..cf963710340e 100644
--- a/sys-apps/iproute2/iproute2-5.10.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-5.10.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 6ac47d16f860..10d2c2e24d21 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -10,7 +10,9 @@ AUX kexec.conf-2.0.4 1013 BLAKE2B 7594bf8c150d1165f30449526b658c78feab82526e649a
 AUX kexec.service 407 BLAKE2B 7854172c36f550fece58b6cb351a6bd8b4ab8b5a11da0fd629048f8cc2866baa11ee7311424f998360f02dc2c1210be32222283c2bd2f93e1bf4bf65ec903203 SHA512 9f0fa6d39c67048fe774fee0f2e8ed10e9e12a2468e7dda193cd8c5bd8b4cf49819d14703efad35c91265cd4e03c6f5460934b5fe92efd06eab8dc619920b1e3
 DIST kexec-tools-2.0.20.tar.xz 297476 BLAKE2B 7e29e7f7d85296dd3e614c45f14c27eca74ce4426d5de2d20387d89f2f63afed318d6157cc4001849a04bb83505bbae87c43d34683ebaf9a70f5f29e3979ade3 SHA512 3112b6202c1030705c53e3f65a2b58aec14d65333a35aad681d48b9f2bd1c51a2e05c985a1e5e867ab02f8a9c97708483d9d225619db7c6993676f1a242e2d99
 DIST kexec-tools-2.0.21.tar.xz 303300 BLAKE2B d5b7bddeafdcbfd2b07dab6e4f167fcb61ccf2ec487f1835ac552a4596d22a94a7297d0eb769913f84eddc564ba4d9ae0c9d4c76994d0e3670fe168f377ebc77 SHA512 f487d2e243c2c4f29fbc9da7d06806f65210f717904655fc84d8d162b9c4614c3dd62e1bb47104a79f0dc2af04e462baf764fb309b5d7e6d287264cb48fd2a3e
+DIST kexec-tools-2.0.22.tar.xz 303564 BLAKE2B 977c741eabf9b6b882550713ba59b18289b4f997fb382e96338efce6d04a9390fea952fc46ca72fd0a0b782261841ab2002da84b1819f955e63996eac900b0f7 SHA512 7580860f272eee5af52139809f12961e5a5d3a65f4e191183ca9c845410425d25818945ac14ed04a60e6ce474dc2656fc6a14041177b0bf703f450820c7d6aba
 EBUILD kexec-tools-2.0.20-r3.ebuild 3381 BLAKE2B 67e203cd4ea7fea5a7c100a5acf8dfa7376f96e98fadd48a3e0a2de430e6ae4092cf29a48b6d56b0a2bac7bb437d402fc8f2b370b9141dbd3eb5d6eac7d03673 SHA512 621707548ff183ed90b5d47531528954894bcde436e1f3beeb93a70e58a5018d3f9d0353d4654b9e57be9ef6cb4ab6f2168511a46106dcc86b9c24b6981b77ba
 EBUILD kexec-tools-2.0.21.ebuild 3265 BLAKE2B 1f5c5356f79113a1956d1b57dcb570f4bd0327ab03aef0917e06cac9cd6e7c1ae02ca530dd9e95b1f8e8f1b9277dd5c96397efb8881cffedf2a8096107e6ccb0 SHA512 163fd666f3f892d80c12bb809f5ef8a5494ba6a3f13bb5e1679b89795d943c19735c631bddc0f3ab51abf417413c20d24af47143941bd35fec747dc1d500d246
+EBUILD kexec-tools-2.0.22.ebuild 3265 BLAKE2B f1b79999adf8df2e0a85cdcc2cd25027e78e8305fd8ba10d530cd2db3d31f8f5a148b978131c77871f4b0a97c0b496fa342834e8b8c4fbea74417c82a36f430e SHA512 bfe4ebad0b2c3e5281309e8f7b76f9f2f5a4a6b19f46b8077b1f066d0a9e41b0dd529d19071c660021d7dad41e9d86b1e5f3af3ca4149a2ea660af89b2eafd5f
 EBUILD kexec-tools-9999.ebuild 3265 BLAKE2B 1f5c5356f79113a1956d1b57dcb570f4bd0327ab03aef0917e06cac9cd6e7c1ae02ca530dd9e95b1f8e8f1b9277dd5c96397efb8881cffedf2a8096107e6ccb0 SHA512 163fd666f3f892d80c12bb809f5ef8a5494ba6a3f13bb5e1679b89795d943c19735c631bddc0f3ab51abf417413c20d24af47143941bd35fec747dc1d500d246
 MISC metadata.xml 490 BLAKE2B 87c80e53801415341290c29dbc0728a4d084519c38f5c5d14bedde32596111f4cbb91c72ed36b6a8fe3f63ad715df57d59b2a61730ebe08ff7f2bc868c8ff916 SHA512 6f4b25178cc6b8ff3fea664f2717eb7268d9e71c4ca46c170887eb836f9d78dff7e64067968175d018dc22bbcc2bb8cd6fd5f44edba0966fa568f9fd827a1cff
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
new file mode 100644
index 000000000000..0879b84e6744
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool linux-info systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
+else
+	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz"
+	[[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P/_/-}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+	"${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+)
+
+pkg_setup() {
+	# GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+	export ASFLAGS="${CCASFLAGS}"
+}
+
+src_prepare() {
+	default
+
+	# Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of overriding them completely.
+	sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die
+
+	if [[ "${PV}" == 9999 ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with booke)
+		$(use_with lzma)
+		$(use_with xen)
+		$(use_with zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Respect CFLAGS for purgatory.
+	# purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable.
+	# -mfunction-return=thunk and -mindirect-branch=thunk conflict with
+	# -mcmodel=large which is added by build system.
+	# Replace them with -mfunction-return=thunk-inline and -mindirect-branch=thunk-inline.
+	local flag flags=()
+	for flag in ${CFLAGS}; do
+		[[ ${flag} == -mfunction-return=thunk ]] && flag="-mfunction-return=thunk-inline"
+		[[ ${flag} == -mindirect-branch=thunk ]] && flag="-mindirect-branch=thunk-inline"
+		flags+=("${flag}")
+	done
+	local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}"
+
+	default
+}
+
+src_install() {
+	default
+
+	dodoc "${FILESDIR}"/README.Gentoo
+
+	newinitd "${FILESDIR}"/kexec-r2.init kexec
+	newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
+
+	insinto /etc
+	doins "${FILESDIR}"/kexec.conf
+
+	insinto /etc/kernel/postinst.d
+	doins "${FILESDIR}"/90_kexec
+
+	systemd_dounit "${FILESDIR}"/kexec.service
+}
+
+pkg_postinst() {
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "For systemd support the new config file is"
+		elog "   /etc/kexec.conf"
+		elog "Please adopt it to your needs as there is no autoconfig anymore"
+	fi
+
+	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
+	local has_rootpart_set=no
+	if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then
+		if grep -q -E -- '^ROOTPART=' "${EROOT}/etc/conf.d/kexec" 2>/dev/null; then
+			has_rootpart_set=yes
+		fi
+	fi
+
+	if [[ ${n_root_args} > 1 && "${has_rootpart_set}" == "no"  ]]; then
+		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
+		ewarn "This was probably caused by a previous version of ${PN}."
+		ewarn "Please reboot system once *without* kexec to avoid boot problems"
+		ewarn "in case running system and initramfs do not agree on detected"
+		ewarn "root device name!"
+	fi
+}
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index cceee126209d..51acf71ec72b 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -2,7 +2,7 @@ AUX kmod-27-depmod-do-not-output-.bin-to-stdout.patch 1521 BLAKE2B 3b1f0808198f0
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
 DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c
 DIST kmod-28.tar.xz 552448 BLAKE2B af41a0c5681fb94eb5264f46ed2ae666d171d4e2d0dc21419a3c2f4b12a783350a06b408fb02a7afb00fcea1cd994ee35864c1ec8b7a8cc58a8c9dcdeffaf1b3 SHA512 50646dc72675a5e17b01e327e3d41b972f18aaeac20c8b00983c4d099c6218f35c32c184a833a2d7f716755d6a86851c90913d2835874cef933bdc4a9722df9a
-EBUILD kmod-27-r2.ebuild 5267 BLAKE2B d57a986acc394e6429a75b146ea2f322d2a8db867aec2c90652c4164022c3000c8df136d81f08f849e0115c5d3adad2291b0a3b4ec11ad33289644c2cdd8602c SHA512 094e256d0914073ba61ecc509a946beb185f0dd5ce13a74c077888b8f360a40e02d0421e3029b0b6116237dea4f690f5086c30247c60631a0b1b1f8b35eeb98f
-EBUILD kmod-28.ebuild 5288 BLAKE2B 01361611c062c28cfea1d02c131c917299f66b0c6d1d78256c7a95bd7871da1442d10d73441fc96ffcf4a4929dd516529f9feb6ec9d36b5b8045df9f84ea8334 SHA512 95461da418ea57db7f29184932a6850ee796922facef5767a3240f17bc39ebaea399ddc90133a7601442fa4fd55f2fbdde636ec235a373bb750bb67bb6dc5ad2
-EBUILD kmod-9999.ebuild 5300 BLAKE2B 35d2369c790062accaa546d58f46b27bb7af159ce1999008c10c2773ac2c79f72fbe24a54982d87f54bada29548d2a0f3555ab128faac015a68c83320aa83b85 SHA512 57997f391cffb6c91fc5cf081761e646c8c61996ad698ed908aafe71cef6073bb18235b27f41093622de3bbb0a0ef6cc607d2487c6b2f91db65a147888ac3226
+EBUILD kmod-27-r2.ebuild 5203 BLAKE2B 94962af9d143cf4ff694763351a02e493910b99efb9f4a62701fdfe6bedbf815a4e24c4db7d8c568559d5647c0e07d0916afae24576db4330c1626083f4cc512 SHA512 08b451e01ec1a05c694713ac0d67fab1e5ebbf0741e5e21231ba2e15bd08b452d5a7732f49d7723dbd13c85b48ac1216c4dca99a297e44e26baa4b1ae41afd8a
+EBUILD kmod-28.ebuild 5224 BLAKE2B a332a2e2544d737b006d0179974de3f86baabfef69ef8291d9c1dda3df94829e2b37fd44862e194eff6107395dcab0ec50ec8e6d99afa136e332212feb34a49b SHA512 9eb983c787a706e7ae56d6b73515d176257ce189a2547405062f5b71a3f6113cea949dd0f73bda634e109608c78869ff40d1bc0cf216b0fba42d780f2a937492
+EBUILD kmod-9999.ebuild 5236 BLAKE2B b8c89c6c4dcddf2b9da47b0b7a6ad342e155f30fadbeb74a1867b3ddee1b6575578407314c116afb19d1597d9a8ea34d5d4fb9ec7ce3a20ad62f51dc257c28ce SHA512 03cb2435a15e335a7a85d3fefea00b25e1a8561a7129b4ff173838092949d0cd88ff90df4ddf4522be5c1df5dcd4b030a22d3b545bb90d87b729167daabd3b1c
 MISC metadata.xml 689 BLAKE2B 51a8819951b28ef934c7de80176ef6aeeacb09ac073a7fcf056428ee2c1a0ad851119e680b4ef2cdd48a26541c2a3e16f6cb6606231a6ed542a00cfdb0e3b2d4 SHA512 4282ad5b89b14e8e50aad8779e68cca6eb2e1c876a3284b6782a221c0da2e79db871d1d23d686c8ac1532ea453faa1291ff596afff716431d0560460953c3aed
diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild
index c086f244d301..1f01479f1508 100644
--- a/sys-apps/kmod/kmod-27-r2.ebuild
+++ b/sys-apps/kmod/kmod-27-r2.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug doc libressl +lzma pkcs7 python static-libs +tools +zlib"
+IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib"
 
 # Upstream does not support running the test suite with custom configure flags.
 # I was also told that the test suite is intended for kmod developers.
@@ -36,10 +36,7 @@ RDEPEND="!sys-apps/module-init-tools
 	!<sys-apps/systemd-216-r3
 	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
 	python? ( ${PYTHON_DEPS} )
-	pkcs7? (
-		!libressl? ( >=dev-libs/openssl-1.1.0:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+	pkcs7? ( >=dev-libs/openssl-1.1.0:0= )
 	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/sys-apps/kmod/kmod-28.ebuild b/sys-apps/kmod/kmod-28.ebuild
index b631bb43ef36..e7a05bd18356 100644
--- a/sys-apps/kmod/kmod-28.ebuild
+++ b/sys-apps/kmod/kmod-28.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug doc libressl +lzma pkcs7 python static-libs +tools +zlib zstd"
+IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd"
 
 # Upstream does not support running the test suite with custom configure flags.
 # I was also told that the test suite is intended for kmod developers.
@@ -37,10 +37,7 @@ RDEPEND="!sys-apps/module-init-tools
 	!<sys-apps/systemd-216-r3
 	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
 	python? ( ${PYTHON_DEPS} )
-	pkcs7? (
-		!libressl? ( >=dev-libs/openssl-1.1.0:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+	pkcs7? ( >=dev-libs/openssl-1.1.0:0= )
 	zlib? ( >=sys-libs/zlib-1.2.6 )
 	zstd? ( >=app-arch/zstd-1.4.4 )"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 462317680995..b2369d923557 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug doc libressl +lzma pkcs7 python static-libs +tools +zlib zstd"
+IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd"
 
 # Upstream does not support running the test suite with custom configure flags.
 # I was also told that the test suite is intended for kmod developers.
@@ -37,10 +37,7 @@ RDEPEND="!sys-apps/module-init-tools
 	!<sys-apps/systemd-216-r3
 	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
 	python? ( ${PYTHON_DEPS} )
-	pkcs7? (
-		!libressl? ( >=dev-libs/openssl-1.1.0:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+	pkcs7? ( >=dev-libs/openssl-1.1.0:0= )
 	zlib? ( >=sys-libs/zlib-1.2.6 )
 	zstd? ( >=app-arch/zstd-1.4.4 )"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index e57e78bfb7f7..ae0ce4558c09 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -4,4 +4,4 @@ DIST less-563.tar.gz 335508 BLAKE2B 813e54b9a115600e4f20009ccad3708efc64ab4ee940
 DIST less-581.2.tar.gz 349230 BLAKE2B 3f9d3c94f3d9eae5ecd033c5f16a575bd3a179ca335b0318e097a916c6713379cafbe6c57459e86866e890a432fb02be9102726b35c46d9bdd07ca1b35f83058 SHA512 b1189396c798d7cb8655175f31b1af6163dcf8e8d7a72531161cc8396e72e0cf5858ce7b39173be603f9f16eda498f2805cf42c2b92ec6970fd9d2b603fb7b92
 EBUILD less-563-r1.ebuild 1365 BLAKE2B ac3ce42ef03de320bfa0b82da8ae412239fe3428e6504168163303b88a733374005fc747a7b17ef2e155d953940ed6730f9f45601abb5285f15a8f503cfc28d2 SHA512 7b969667cf1a7e0a977b6aa460a99f2a27618b1a615dd90f84a3a9ed61d23e5ee4561e35bfca06015be65f48d6bd2f85f1363e73d86385410973e0f4278f9b53
 EBUILD less-581.2.ebuild 1373 BLAKE2B 0e90c4509da6284b81b1ee9a4421cc97289aa5e2d67532eafbe1da9c5cb151ae11f983578ea13a1e131e26d15a3b1305428f07713b270fe1ea8375d79e5e666c SHA512 caa47b488beb99d13dcbbad8550c633b5f80e0fb46838bc2244bde3a9e8cd38115a675a4e1be362041bd7c6b45f9fcc77cadf851ad9ce1d263852c668932b8a3
-MISC metadata.xml 327 BLAKE2B 581c56f3073ebd542d8edf73fca5effb7cacd1eb3778b427e9b5fae6ce174931240f957be61951d2233feeb899e5eb08317f9d05f223532b532dd2467856d101 SHA512 dd40867f5f419a029deca5f613b89651fbc6fc71fdd9bf18600f063358295de781390037a1b2c0d28cfc8f65b56e71e9923f231a16a672dc8bc1284104462b95
+MISC metadata.xml 383 BLAKE2B 5f11eeb30186e0e73c0c06f244a6eef420b756f60a15fc992cab99deebd2b0d0056d4a12628e9a5ef9494838b1a81efa11567a99182976d7bbe3db048c058d8d SHA512 cf7a569bd5f70879f8c5d8a732213295d53a49c288143523723d6970a176e90fe678e2c2bd76eca630a31deee69a386c498884ffc4b24f8622cf8a60a80848b4
diff --git a/sys-apps/less/metadata.xml b/sys-apps/less/metadata.xml
index a759e4cfa838..9cfb1af44778 100644
--- a/sys-apps/less/metadata.xml
+++ b/sys-apps/less/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<upstream>
-	<remote-id type="cpe">cpe:/a:gnu:less</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnu:less</remote-id>
+		<remote-id type="github">gwsw/less</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index c84001d67def..9cd33b9de98f 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -2,12 +2,8 @@ AUX openrc-0.42.1-gcc-10.patch 1679 BLAKE2B 464fa390a6626538dad9d68d9e1c81195ee5
 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646
-DIST openrc-0.43.1.tar.gz 240008 BLAKE2B 0db27cca0a6e965c5333ee07a7f9f361dc7c32b82d413efa7ee472ecf253f82be03bb9006f7d9f2ff45af5b8de685b5700095175fde444bb8ba08b8d770f0500 SHA512 0c4590b6cc15872622824ac53d574d831f536ba983ab7171b227e22441651566d36cfd7e69b28223fa25aab9f3457fb889e6e3225069d08552d440df12e6af84
-DIST openrc-0.43.2.tar.gz 240267 BLAKE2B a279833861c2e060aa6a95997bf384407bce395589b3a29cc9ab30c3ec11584da8e16501dfaaebe72ba0342513efdca6fa402995c22ceeb78d5ddd9f1f0d2252 SHA512 ecf55ec003a597bb13f1726082f062f426d23ac98ac680a913486bf4fb340fa6a26678d3e9f5158874b9591266903c5627188aef734a7e946c5e22db3a1b70ce
 DIST openrc-0.43.3.tar.gz 240431 BLAKE2B 4e7326e2cb87fbb9101b616f0ad5a955f38f387e9d940a0ae1d00a8b48e7733411b3f0a4bb70bfc6a63cb4769354d7836cb4accd695b73f601d9b6bab8b8a8ea SHA512 a6b0a3b7eba7624ed00cb33253cec71059b9af194f3828eb7417f9faba551ecdff7c1e1b5132772969a9c868ff60a92378b28e56e54edfe8e0f4e143aa43b8c5
 EBUILD openrc-0.42.1-r1.ebuild 5471 BLAKE2B a3749af382add50151e08b679ac8548f4a229784de8ca796c1c5d113ea190c42980e18ad8bd5598fee43a049538e4d806398aabe7bdfa27a79361529bfdd5445 SHA512 638ff01c5c1de288e462790dbc9c5801b326768051933a96a9338278b36208a39934be4e7b9605ca286e30baa9e83dab58075e50ee9de112ce4e117cc0767b97
-EBUILD openrc-0.43.1.ebuild 5035 BLAKE2B c6fb18f7ce7aff1b5ee7aa242b0b578cc712c71a8cb300fc9070b41fcc511eec632ac9a75896d3c20dd553b0fe9839c7c409382a5c801a6f16eae03e60f64b2f SHA512 cdd691b9a30a2fc8bd064a11bd37d4c93893a26282fb5fa17c177f90c6101eed1d46031138ba3443c8bf28e98768ca8e7cca597da3c9a20e0b3af8d9ea630906
-EBUILD openrc-0.43.2.ebuild 5035 BLAKE2B c6fb18f7ce7aff1b5ee7aa242b0b578cc712c71a8cb300fc9070b41fcc511eec632ac9a75896d3c20dd553b0fe9839c7c409382a5c801a6f16eae03e60f64b2f SHA512 cdd691b9a30a2fc8bd064a11bd37d4c93893a26282fb5fa17c177f90c6101eed1d46031138ba3443c8bf28e98768ca8e7cca597da3c9a20e0b3af8d9ea630906
 EBUILD openrc-0.43.3.ebuild 5035 BLAKE2B c6fb18f7ce7aff1b5ee7aa242b0b578cc712c71a8cb300fc9070b41fcc511eec632ac9a75896d3c20dd553b0fe9839c7c409382a5c801a6f16eae03e60f64b2f SHA512 cdd691b9a30a2fc8bd064a11bd37d4c93893a26282fb5fa17c177f90c6101eed1d46031138ba3443c8bf28e98768ca8e7cca597da3c9a20e0b3af8d9ea630906
 EBUILD openrc-9999.ebuild 5013 BLAKE2B eba47aae6e1d07c2ccd925f2e380268a6ab96aec37e245b3ccf0474d30fc19811a5f45c610a6fd68760a4695f48040733aa524f41c86a9149bcdbb97195ba4a0 SHA512 24970d1219d2fc2c93ecd6ddc22200af0a3e70decb506f06ffd2f3be15a7b3a37398e150f26d6c2477b59f3ece72babf61056ddd3c6e86233b7576f081460cd3
 MISC metadata.xml 706 BLAKE2B 1d6a4937d577fff7db7fd64617328ca49faccaa61749adabc411a215960ee06c1af32499be697921012eee34f5c680295e46f545099f06393965a17c0d0d034d SHA512 d5d669cdcf8707689c855cab678031c6e9b1e33e4b931c7d80bbe2ad442aedabef718018466f0cb15bd8a329292a0de844935f9332611f3fb334b57d14aa39c1
diff --git a/sys-apps/openrc/openrc-0.43.1.ebuild b/sys-apps/openrc/openrc-0.43.1.ebuild
deleted file mode 100644
index f6eaa2172d22..000000000000
--- a/sys-apps/openrc/openrc-0.43.1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils unicode"
-
-COMMON_DEPEND="
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? (
-		sys-auth/pambase
-		sys-libs/pam
-	)
-	audit? ( sys-process/audit )
-	sys-process/psmisc
-	!<sys-process/procps-3.3.9-r2
-	selinux? (
-		sys-apps/policycoreutils
-		>=sys-libs/libselinux-2.6
-	)
-	!<sys-apps/baselayout-2.1-r1
-	!<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	bash? ( app-shells/bash )
-	!prefix? (
-		sysv-utils? (
-			!sys-apps/systemd[sysv-utils(-)]
-			!sys-apps/sysvinit
-		)
-		!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
-		virtual/tmpfiles
-	)
-	selinux? (
-		>=sec-policy/selinux-base-policy-2.20170204-r4
-		>=sec-policy/selinux-openrc-2.20170204-r4
-	)
-	!<app-shells/gentoo-bashcomp-20180302
-	!<app-shells/gentoo-zsh-completions-20180228
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-	fi
-}
-
-src_compile() {
-	MAKE_ARGS="${MAKE_ARGS}
-		LIBNAME=$(get_libdir)
-		LIBDIR=${EPREFIX}/$(get_libdir)
-		LIBEXECDIR=${EPREFIX}/lib/rc
-		MKBASHCOMP=yes
-		MKNET=$(usex newnet)
-		MKSELINUX=$(usex selinux)
-		MKSYSVINIT=$(usex sysv-utils)
-		MKAUDIT=$(usex audit)
-		MKPAM=$(usev pam)
-		MKSTATICLIBS=no
-		MKZSHCOMP=yes
-		OS=Linux
-		SH=$(usex bash /bin/bash /bin/sh)"
-
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-export BRANDING="Gentoo Linux"
-	export DEBUG=$(usev debug)
-	export MKTERMCAP=$(usev ncurses)
-
-	tc-export CC AR RANLIB
-	emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-	local file="${ED}/$1" var=$2 val com
-	eval "${@:5}" && val=$3 || val=$4
-	[[ ${val} == "#" ]] && com="#" && val='\2'
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-	set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-	keepdir /lib/rc/tmp
-
-	# Setup unicode defaults for silly unicode users
-	set_config_yes_no /etc/rc.conf unicode use unicode
-
-	# Cater to the norm
-	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-	# On HPPA, do not run consolefont by default (bug #222889)
-	if use hppa; then
-		rm -f "${ED}"/etc/runlevels/boot/consolefont
-	fi
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-
-	if use pam; then
-		# install gentoo pam.d files
-		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-	fi
-
-	# install documentation
-	dodoc ChangeLog *.md
-	if use newnet; then
-		dodoc README.newnet
-	fi
-}
-
-pkg_preinst() {
-	# avoid default thrashing in conf.d files when possible #295406
-	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
-		(
-		unset hostname HOSTNAME
-		source "${EROOT}"/etc/conf.d/hostname
-		: ${hostname:=${HOSTNAME}}
-		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-		)
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-	return 0
-}
-
-pkg_postinst() {
-	if use hppa; then
-		elog "Setting the console font does not work on all HPPA consoles."
-		elog "You can still enable it by running:"
-		elog "# rc-update add consolefont boot"
-	fi
-
-	# Added for 0.35.
-	if [[ ! -h "${EROOT}"/lib ]]; then
-		if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
-		fi
-	fi
-
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRc without network support. This"
-		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
-		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
-		ewarn "Or, you have the option of emerging openrc with the newnet"
-		ewarn "use flag and configuring /etc/conf.d/network and"
-		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-		ewarn
-	fi
-
-	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
-		ewarn "Please add the network service to your boot runlevel"
-		ewarn "as soon as possible. Not doing so could leave you with a system"
-		ewarn "without networking."
-		ewarn
-	fi
-}
diff --git a/sys-apps/openrc/openrc-0.43.2.ebuild b/sys-apps/openrc/openrc-0.43.2.ebuild
deleted file mode 100644
index f6eaa2172d22..000000000000
--- a/sys-apps/openrc/openrc-0.43.2.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils unicode"
-
-COMMON_DEPEND="
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? (
-		sys-auth/pambase
-		sys-libs/pam
-	)
-	audit? ( sys-process/audit )
-	sys-process/psmisc
-	!<sys-process/procps-3.3.9-r2
-	selinux? (
-		sys-apps/policycoreutils
-		>=sys-libs/libselinux-2.6
-	)
-	!<sys-apps/baselayout-2.1-r1
-	!<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	bash? ( app-shells/bash )
-	!prefix? (
-		sysv-utils? (
-			!sys-apps/systemd[sysv-utils(-)]
-			!sys-apps/sysvinit
-		)
-		!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
-		virtual/tmpfiles
-	)
-	selinux? (
-		>=sec-policy/selinux-base-policy-2.20170204-r4
-		>=sec-policy/selinux-openrc-2.20170204-r4
-	)
-	!<app-shells/gentoo-bashcomp-20180302
-	!<app-shells/gentoo-zsh-completions-20180228
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-	fi
-}
-
-src_compile() {
-	MAKE_ARGS="${MAKE_ARGS}
-		LIBNAME=$(get_libdir)
-		LIBDIR=${EPREFIX}/$(get_libdir)
-		LIBEXECDIR=${EPREFIX}/lib/rc
-		MKBASHCOMP=yes
-		MKNET=$(usex newnet)
-		MKSELINUX=$(usex selinux)
-		MKSYSVINIT=$(usex sysv-utils)
-		MKAUDIT=$(usex audit)
-		MKPAM=$(usev pam)
-		MKSTATICLIBS=no
-		MKZSHCOMP=yes
-		OS=Linux
-		SH=$(usex bash /bin/bash /bin/sh)"
-
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-export BRANDING="Gentoo Linux"
-	export DEBUG=$(usev debug)
-	export MKTERMCAP=$(usev ncurses)
-
-	tc-export CC AR RANLIB
-	emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-	local file="${ED}/$1" var=$2 val com
-	eval "${@:5}" && val=$3 || val=$4
-	[[ ${val} == "#" ]] && com="#" && val='\2'
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-	set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-	keepdir /lib/rc/tmp
-
-	# Setup unicode defaults for silly unicode users
-	set_config_yes_no /etc/rc.conf unicode use unicode
-
-	# Cater to the norm
-	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-	# On HPPA, do not run consolefont by default (bug #222889)
-	if use hppa; then
-		rm -f "${ED}"/etc/runlevels/boot/consolefont
-	fi
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-
-	if use pam; then
-		# install gentoo pam.d files
-		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-	fi
-
-	# install documentation
-	dodoc ChangeLog *.md
-	if use newnet; then
-		dodoc README.newnet
-	fi
-}
-
-pkg_preinst() {
-	# avoid default thrashing in conf.d files when possible #295406
-	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
-		(
-		unset hostname HOSTNAME
-		source "${EROOT}"/etc/conf.d/hostname
-		: ${hostname:=${HOSTNAME}}
-		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-		)
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-	return 0
-}
-
-pkg_postinst() {
-	if use hppa; then
-		elog "Setting the console font does not work on all HPPA consoles."
-		elog "You can still enable it by running:"
-		elog "# rc-update add consolefont boot"
-	fi
-
-	# Added for 0.35.
-	if [[ ! -h "${EROOT}"/lib ]]; then
-		if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
-		fi
-	fi
-
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRc without network support. This"
-		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
-		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
-		ewarn "Or, you have the option of emerging openrc with the newnet"
-		ewarn "use flag and configuring /etc/conf.d/network and"
-		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-		ewarn
-	fi
-
-	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
-		ewarn "Please add the network service to your boot runlevel"
-		ewarn "as soon as possible. Not doing so could leave you with a system"
-		ewarn "without networking."
-		ewarn
-	fi
-}
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index b0a2d83de3c4..6d7284272e16 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -6,7 +6,7 @@ DIST pkgcore-0.11.6.tar.gz 634191 BLAKE2B c06f24006be697771dd3d7569e3a27310dca56
 DIST pkgcore-0.11.8.tar.gz 631665 BLAKE2B 1e33ce394c1df9418d22fc8653fca4da1b4e27d53325167e3b7231fb8382f3c81daa7a93587ab2226116865546d4ca1ae1dd4265ccc2adc9cb9b27106d9c352b SHA512 42ed7c54db5fa48dffa5e3927afae32d1b4db92da41eff99c8eaa10232fdeae4e0f3f4d39b1e1b4e3881304523822a9a99575648809c554e3bdcf59d9eab485b
 EBUILD pkgcore-0.11.2-r2.ebuild 1111 BLAKE2B 676d166638807895799de77fcf881962d60734dcb86eba10b726b1c2fb43629f7f2e86948a6f2a9770d5a4737413a6d6396212aafdc9e902bda064f8c64b046d SHA512 38fca7cc42e4e87a164d3f6912786fa0feb5bea777ac9028848b6bbf264de3af5f4a43cf1ae6d6c4eb77c66b8fd66336d8ac7ad27e61a1ee505469b817f54fc4
 EBUILD pkgcore-0.11.5-r3.ebuild 1228 BLAKE2B 76f7aa64db9f6c222c2fe3e81525d81788d941cbeb2abd28d92f3b95c475dcc7feccebc4e64d0f42fb7490f84f50cd87f17c46088a37f983e546327099a7df13 SHA512 035781e3dcd799fb44bdc8ce84688e4f3919ce49f8db8d7e0f56cce91784caf0f6a83adea07e0309e0523c32f0daa5856dcf300daf2ed95be4c6c6c09acb4aa0
-EBUILD pkgcore-0.11.6-r1.ebuild 1128 BLAKE2B 07288f4d2cc2ceb10cec86371dd088a1d83430d5a10aa3d64ae99e4933581542b95710e70e8c2526d380f3264c5377e0b1513fe57724c02f95b8c547b4b0c3fb SHA512 073f93cdbf01a48789ffb878ef13d25dbb8fc53787f5549e9f38acbe2d09bd7a94b842f5ae23ca1db19754fe40eff49a99076329ade4ce6a548facb5b6a6ed23
+EBUILD pkgcore-0.11.6-r1.ebuild 1127 BLAKE2B 044d792557c997a47814f18ef40a27b4136df40247a7ccd11c20bdf4baf5b2ac3cbb287c185ded8709409ce5d709a5fd4bfde145f1dd1e5f9a9350b7efa2162e SHA512 8795d3194db29c36862dd4d1ecf46e323f163a331b5aae2182aeca4e68838b446e64a1be7653e03662af18cac10e9849d9d736693df771828cc435e25f18a106
 EBUILD pkgcore-0.11.8-r1.ebuild 1146 BLAKE2B 329fc5a8f7b4a514703746a4cfc9a0ce6401aad074cd3f46f0e0bf7202155245e716927b1c919f135844b6891b141655e64b83291f7945e263a3b21818dd2264 SHA512 c934d61f4d162f71ba1b8a946a8d2b6b31dc4e6e602e4532c1172a3f110d9ff74523fdb9f26b6b4424327bcba2d87691e12ed14d13f1353b3455766f8d6f02eb
 EBUILD pkgcore-9999.ebuild 1081 BLAKE2B f59f5bab0d4b3f26c2dddcdb8bebe550aa89462cbb9c4c7aadee461b17679dcd3fa39e37208a8853532592a235d959838af6c17bd6c807381db110a8c35a5205 SHA512 b6fb191a3d84a189f45f1ed6c4ebf2bc02fd729688b10ad98b7bc5767ac0dd16e07f052d015e93a84e21a0e3ed1d6c82f8328a926e24b21ee3204863a6ce1d07
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/pkgcore-0.11.6-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.11.6-r1.ebuild
index b3b0051fd372..2ff367e894b1 100644
--- a/sys-apps/pkgcore/pkgcore-0.11.6-r1.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.11.6-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
index d2b7e3a7cbcc..cb618d0f1a5e 100644
--- a/sys-apps/plocate/Manifest
+++ b/sys-apps/plocate/Manifest
@@ -2,8 +2,6 @@ AUX plocate-1.1.5-no-systemd-check.patch 764 BLAKE2B f2a97b7c85339e7b7de663e1097
 AUX plocate-cron.conf 237 BLAKE2B 531d6461309b520db31ab8f682ebbe56f2cd425222ebbc16a4662b606f5a0c6c62e4b1475a02ec3f244dde1ff73fe0ad16e0850aec53e6e8836fd0ba1273ad07 SHA512 ab055b052980783b5c63c716d7c12dcb19961a9f990c077e4f8c9bef4ca591bd281ac3941f872659a558a18b81c014dbc0655ff0a1872310670d8efc1d27cb00
 AUX plocate.cron 1392 BLAKE2B 89f7eb05879c0c1a6c30376d36dc469dde0b94df3758ae659012cf9fb6e9fb2783a0d8e53ea5f79d99e2f00be72ef24a254f2d91038a30dc9e19cd2b250782f9 SHA512 b15583e98e253c2fcb658bd9c1c589bacddb8b033eb565333d9f990b1fd320fcfbe1d950657c8b5823d4cb034ccad369bdd2178ef955e42aa9c2f8e8a0268b3f
 AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a054e3e9fc256102db676ab0568501b695d943fcb74ae6ab01585bf7301cc6aa9ce6d709cc1690b5 SHA512 8b0b32e949636aef46c5439b0c963cc113306cedb1e5c84dbbfa2efba6562ca6dd602fdbfa0b3bc9095b0cf30a619ebb366535406cdb461f20d012ec1af7ff9d
-DIST plocate-1.1.5.tar.gz 69090 BLAKE2B 70b398eb1a5d7b36294188966ef5f46843d9db9f41021a294d88795944412b4ef3819771082955a74a9945296fa14c59461a4ab4af197691f7085a40eeb7f0ef SHA512 6169ea7b3587e12e555a42e0c70e149626810f5e6f9f1f03ca1b069d7892d45bc52cabf072324eaa6f14055943dd680a71642914c0218a770e2b00a22c75efbc
-DIST plocate-1.1.6.tar.gz 71518 BLAKE2B 497ff8061e3e880e2502cb3fd13e3c9de06e8c4fffdc6b405e1a9a4e33f694b86f2e32fee93f57f5dd122b52a4a8615f1615ee77c6519448afcc596210aced65 SHA512 d94104b774ad75f60b8de2c044ac203ed28ffd6a0765818cf3e9d50d589d0c53cefbe77510d650c221e2c36b8672f63cd45ccb2f8774b20f9cb4d51de0bb4dbe
-EBUILD plocate-1.1.5.ebuild 1857 BLAKE2B b90e979dd6f7771a0ef4c481e0563f59208f35ab1032b61a3c9a1998dd987cd5793ab0d6d80110822c85abcbcc117ff12d5a613025e8185d1ec3f09c9aef341e SHA512 ed35405d72cc84b4c5469a681dc03869054ca6ea9b7a8155001b2d13361536375a9985c28caddf689d840ec24f2a497363957be9f9b7e15317531656943d2758
-EBUILD plocate-1.1.6.ebuild 1857 BLAKE2B b90e979dd6f7771a0ef4c481e0563f59208f35ab1032b61a3c9a1998dd987cd5793ab0d6d80110822c85abcbcc117ff12d5a613025e8185d1ec3f09c9aef341e SHA512 ed35405d72cc84b4c5469a681dc03869054ca6ea9b7a8155001b2d13361536375a9985c28caddf689d840ec24f2a497363957be9f9b7e15317531656943d2758
+DIST plocate-1.1.7.tar.gz 71546 BLAKE2B 3ea93c7fcea243d60e61dd9956d4eaef3f09d017d5b2487466e4bccbfb6ff6d2e2e328c3df7809eac3ca5c5e0941e67178c1707f3e16154a9d2c756dab3aea00 SHA512 48ca7bcb439e6ddfbc11f0679bb44ee7173be7f7a856d51d56143bd86e219e19683312036bfa96434a0eaaf0b6df58a1843ecae917143f8f0fbac83b39cb0b4b
+EBUILD plocate-1.1.7.ebuild 1857 BLAKE2B b90e979dd6f7771a0ef4c481e0563f59208f35ab1032b61a3c9a1998dd987cd5793ab0d6d80110822c85abcbcc117ff12d5a613025e8185d1ec3f09c9aef341e SHA512 ed35405d72cc84b4c5469a681dc03869054ca6ea9b7a8155001b2d13361536375a9985c28caddf689d840ec24f2a497363957be9f9b7e15317531656943d2758
 MISC metadata.xml 1285 BLAKE2B 778c722e0b5e673f97f22f3c60fb2ed5cd1ce18ceb6aec3426049010eaa930a51bb68c2bda2b9a3f471a9737dec406c52fc849cb674df913410868d3c9dd5479 SHA512 f558b515d2dabb31d11ace480ad94c8c2a925c5ffab618930bb3fecc29fb710f7ad3ff253955272930004ca96344950ce5aa743bece0862a3a6c1c1675be22ff
diff --git a/sys-apps/plocate/plocate-1.1.6.ebuild b/sys-apps/plocate/plocate-1.1.6.ebuild
deleted file mode 100644
index 4aaa46baf9c4..000000000000
--- a/sys-apps/plocate/plocate-1.1.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info meson systemd
-
-DESCRIPTION="Posting locate is a much faster locate"
-HOMEPAGE="https://plocate.sesse.net/"
-SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
-
-# GPL-2 for updatedb
-# GPL-2+ for plocate itself
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+io-uring"
-
-RDEPEND="
-	acct-group/locate
-	app-arch/zstd:=
-	io-uring? ( sys-libs/liburing:= )
-	!sys-apps/mlocate
-"
-DEPEND="${RDEPEND}"
-
-CONFIG_CHECK="~IO_URING"
-ERROR_IO_URING="required for USE=io-uring"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.5-no-systemd-check.patch
-)
-
-src_prepare() {
-	# Pretend liburing dep doesn't exist when USE flag off
-	if ! use io-uring; then
-		sed -i "s/dependency('liburing/dependency('/" meson.build || die
-	fi
-
-	# We'll install the manpage ourself to locate.1
-	sed -i "/install_man('plocate.1')/d" meson.build || die
-
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dlocategroup=locate
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	dodoc README NEWS
-	newman "${S}"/${PN}.1 locate.1
-	dosym plocate /usr/bin/locate
-
-	insinto /etc
-	doins "${FILESDIR}"/updatedb.conf
-	doins "${FILESDIR}"/plocate-cron.conf
-	fperms 0644 /etc/{updatedb,plocate-cron}.conf
-
-	insinto /etc/cron.daily
-	newins "${FILESDIR}"/plocate.cron plocate
-	fperms 0755 /etc/cron.daily/plocate
-
-	systemd_dounit "${BUILD_DIR}"/${PN}-updatedb.service "${S}"/${PN}-updatedb.timer
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		elog "The database for the locate command is generated daily by a cron job,"
-		elog "if you install for the first time you can run the updatedb command manually now."
-		elog
-		elog "Note that the ${EROOT}/etc/updatedb.conf file is generic,"
-		elog "please customize it to your system requirements."
-	fi
-}
diff --git a/sys-apps/plocate/plocate-1.1.5.ebuild b/sys-apps/plocate/plocate-1.1.7.ebuild
index 4aaa46baf9c4..4aaa46baf9c4 100644
--- a/sys-apps/plocate/plocate-1.1.5.ebuild
+++ b/sys-apps/plocate/plocate-1.1.7.ebuild
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index b1b63b0c5d89..9394cc343c15 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -5,6 +5,6 @@ AUX rngd-initd-6.7-r1 1683 BLAKE2B 34bea128a94f2fc8479ebd8e8a398a01bb96dcbe8dd74
 AUX rngd.service 133 BLAKE2B 1c3059e7ee924b42bc6567f5142973d550282248b3e49053b96782039ebd63096a0a8960d3e5a43cfac1d505c57e71015ad706099f06ac2809adf52c0b108d7c SHA512 51e9ea84b624cda8d3689d6a9a8d60da4a556aa9d2a1a04e698d9a1490717aa47172e152c93711f8d04be8a5b68b1dfd568a762bd8ee7219afb7cdfff15657d2
 DIST rng-tools-6.10.tar.gz 56806 BLAKE2B 6cce0579a47f638cd90b51ba5216712fe39bf92dd59b288691a5e9783d520212cfb62e875a7e8f85de7a932568fdf0287cbea6f4869c9616a4c9325a111b0243 SHA512 b72d8918f709989ebc70cb9ea9c8b3dabf53041b24bc3f3a6de1bea318861dfd6c1a6110bd750041dc4819406db4a2b28f5137af5f5d5f2beb666f607913b389
 DIST rng-tools-6.11.tar.gz 57366 BLAKE2B d613502bcb24560638c0abc956987e57ec54b6594bed414ce2b70086716f73a9a9eec4800c86097c4a14b91401f0f28be62f5182ee01c328c9a32cd79eaec561 SHA512 0058ca5d0c1ddb554284fe8e6b9c0b85f130e0b9e0b9f0f0219f434302766e07c321d4fc0c01bdeb59053d5cd14dab67dc1c306422ef35a62a267af9fbdf7deb
-EBUILD rng-tools-6.10-r1.ebuild 1861 BLAKE2B 95f605d3732ea1360c235734b7062e3205a8c9797c741c0206160558634972d11d2b43ac7c936deb30b3bb33ff7d6dc3c197c35e68ea6a8cae430c8c99f38a02 SHA512 c9af7757433b193a388c64ee3b4e960d308366104aa162307dc550d75a6aef2004b605db34aa419417a41e33ccf9686e1abafee4bddf3d375d7fc3ba37935fd2
-EBUILD rng-tools-6.11-r1.ebuild 1859 BLAKE2B 1635014e03c89473ef4d703283345c14e8157fdee7a9f9ca2ae18faa43b7b5065db52a793e6421fbf44e09bf8cd349fe6e39444dd985ed5490f2f028b828b753 SHA512 95f7b6867cab270b483a8371366d3e8a0330564d1c895a155f266bba4fa0141ba038f29e404a4841dd0a66570dc73e6acbe8237f58ff1c57f2fd831cb4cfad82
+EBUILD rng-tools-6.10-r1.ebuild 1801 BLAKE2B 5a4f8f9ff195d74dab6a42a00d378148b9f5054fc4e415753ad765c8d8d11305304a850541d5762ff4d4de17adb105c78eb83b0508bcd799696f50f1678708c3 SHA512 15f4b5c429b96c91249dc0350f41ae0d098110d2a999b0117ebc840147135a96ff2c7cffd65bc19e490e347e4be93e90aea683f1e3ccf90366f2c2cfa79b05f8
+EBUILD rng-tools-6.11-r1.ebuild 1799 BLAKE2B 06fa278fcf75bdab22c29ddd5c77ef20d4bc680a7df4073b95d1ab3deca1a8dcb5ae9671190140a82abc443c8a66e88be973d96d7432470691e5c7f0bf766456 SHA512 e267d1c556edb373a6c7814b1eadbbb6b64a87cda7f0c4e96a9d050e9ec6b3721eadc27004d6262615e3b8b16489135b4d9ad8a87776bc24b12b54f7e103666a
 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/rng-tools-6.10-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.10-r1.ebuild
index 1d3092b3fdfb..a46c160a80f6 100644
--- a/sys-apps/rng-tools/rng-tools-6.10-r1.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.10-r1.ebuild
@@ -12,11 +12,10 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
-IUSE="jitterentropy libressl nistbeacon pkcs11 selinux"
+IUSE="jitterentropy nistbeacon pkcs11 selinux"
 
 DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	sys-fs/sysfsutils
 	jitterentropy? (
 		app-crypt/jitterentropy:=
diff --git a/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild
index d691af46947e..8392ad2b6586 100644
--- a/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild
@@ -12,11 +12,10 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
-IUSE="jitterentropy libressl nistbeacon pkcs11 selinux"
+IUSE="jitterentropy nistbeacon pkcs11 selinux"
 
 DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	sys-fs/sysfsutils
 	jitterentropy? (
 		app-crypt/jitterentropy:=
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 9597458fbf60..ba53371cfabf 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -3,6 +3,6 @@ DIST sandbox-2.21.tar.xz 434540 BLAKE2B c9af3b44e65d96d20b98996a4b9e35cccf6b6202
 DIST sandbox-2.22.tar.xz 437872 BLAKE2B 248920733ffcb56422bf02711f1ae69e81a176ffb59a1a45266bb81779e2916841eee0d237be4010062693604603893973f1fb295276c25a59654dc56a2593b4 SHA512 9c83e7748aad99e14d43ad81e6f3a8d818b821467023bbb3059ce8cee248090583d31500c1278705110f1b62cad5e5bf7f23390c6548095df709521c7d842eba
 DIST sandbox-2.23.tar.xz 437980 BLAKE2B fd417ea88512e7716a7f075442f684dc67b6c7d991e4375b47de4411353abd52764e5b85709aef06d175ba492b73edf5162c03e66e456cedb8586add18c8b5ea SHA512 d25b27bfeb5f5b9a331029a453be93947f32870b84d0e11efc5bb82044de6005111959a4efef87f1055e7065f76deccce6338d44bb7ab32e3a5ec053a429dbd5
 EBUILD sandbox-2.21.ebuild 1884 BLAKE2B 7fbf74c7bb4ed328c301f1f415b085f45b1e39992d730019fc598e8fe4864ca4b0ff570902b2ae970333c3e2af3e00f2d1d3258cd5372b0e3bf89a2a67f0f9ee SHA512 bb53ced577f1c449b84bf39fde7e2472a02df90d18ef1a2fef070dbc26d9cef995544c4289b2a9e0d49f876c2c0f970212a02e9e397ec22d45c4f790b939434d
-EBUILD sandbox-2.22.ebuild 1438 BLAKE2B 28d7dabc32b6b2f63312b7c2e27fe950c2b780f28abe322d3afade5f6a12a23a48ff17df7ea33aa8b38e804d9e1fb5ba72b7faea343beb0deca2b018086dc932 SHA512 68c2e44d7e1592f6acf21b1c624d470ca843cb79cc777c50c0459137f4baa7841fa7c67bede57217820ac4b0edaca08e4a99581a50837fa7f9ca986372de96ed
+EBUILD sandbox-2.22.ebuild 1432 BLAKE2B 575c5ba04805d4e3dc37348ff96876e4ccf764f3db6bea776a7281b4b6ba2714f70e6f66ade8740dc77578f8d1bc816b38b3ea908d723c7845857836f68711e9 SHA512 610bf260406bf4c7e0e17b0c9858ce41aa0a8c19e423202f0b55de77a850f7d750a82c5afae5e06fd616bc4ba2a182d45bd2e33225dbb18803e50c8e815a867f
 EBUILD sandbox-2.23.ebuild 1438 BLAKE2B 28d7dabc32b6b2f63312b7c2e27fe950c2b780f28abe322d3afade5f6a12a23a48ff17df7ea33aa8b38e804d9e1fb5ba72b7faea343beb0deca2b018086dc932 SHA512 68c2e44d7e1592f6acf21b1c624d470ca843cb79cc777c50c0459137f4baa7841fa7c67bede57217820ac4b0edaca08e4a99581a50837fa7f9ca986372de96ed
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/sandbox-2.22.ebuild b/sys-apps/sandbox/sandbox-2.22.ebuild
index 844b1e1fe4cc..b96dfe9cad45 100644
--- a/sys-apps/sandbox/sandbox-2.22.ebuild
+++ b/sys-apps/sandbox/sandbox-2.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 4022a164d219..91b8f8c51d62 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -1,11 +1,9 @@
 AUX sg3_utils-1.26-stdint.patch 678 BLAKE2B 52a78fcc176492e6ca5a7a4465e76a3b6642b27c3b6dd77d5d0e8e7f7c59e564cd7e78f2297847db2e0c6b4611284cf5a67973ec9bcc533deab4625381f27d04 SHA512 07f7d46d70f79508169c482bbe251dd4057be4d546ce8ac4b0928ca8708c55086ca2765c78e5f894af1828ff7383ff33b5d354d4c1af9857a9122dfd6fc916fb
 AUX sg3_utils-1.42-sysmacros.patch 925 BLAKE2B 0a066dccd2e69c0a9a5e6ed20d87700e85061146956601777c754e9411b70de01456bb894091fb0ea0228eb060172601492ea678de158c4733f6ec423f176156 SHA512 f90ecb687f851a45684ad0b1f13269c4d674e849f6782b4f328d7f43f04209ee8442a7b428c27a57610f0ffc4c04343f357e700b22a6817835a3da09300a4f89
 DIST sg3_utils-1.42.tgz 1219231 BLAKE2B dd9ea2c324cb6f4c0ce770c90b7980da5e998bddc3a2be43a0aa9bea88dfe34291d0f58b393b2a5ac680c05dc673802ec9fae1ead37107bc49fa33bc7c4df503 SHA512 d16b65e36b2bccb4fc4c189f97e71fa38e6619f37d668a4ddd74a52c715fa62325288d9737812ed19c80547059dbd27be5a20565e27e1aabb571e8f5f8ac53ad
-DIST sg3_utils-1.44.tar.xz 922152 BLAKE2B 8596ef78fbb7ade5a969f485b0f4ff63863dc8a5ff58fe630cffa91900ba9946b47ddf857346aa3904da8502afa4928f54baf99428344d2e561a90e52c8533ed SHA512 4f4d5536ebed62f2c81c55741043d9ac3f4610a4dd6ef2e3125f041afd57aae03a32c2affe84a960c9f61fb6f84784bc901c756a8c36c1bc97082fa61e73ae8d
 DIST sg3_utils-1.45.tar.xz 989864 BLAKE2B 2d0a9e0edf514c8c7a566798f8087fc27d15d31cc8df39073dd97cff569da396b24236e0c231781625379b2ecefe7c99716d5d9c7dc104b15e150cb4e3c43e75 SHA512 fa25dedc447154d33937248a856af9a7ef380dda282a681d465a57d7dfc24b6c0409fa06aabf8cc28ba191e91db80fed0757b45212eddf713855574b48a97868
 DIST sg3_utils-1.46.tar.xz 1031800 BLAKE2B 034af23d10da49938979ea4d0041c6ce4309b9ceac13f06bd524011dccf285e88fbc5f4c3f261ec3e316db86278ccff235015de43d98b0b62ff05a2f98df0850 SHA512 0b4caab97ccc11fb45e88219e460b37c6ff69b8f3c79e513279aef51783ff22399d141253abdbf55db198db0815bc39d30e9b1e3bd7dda5e15c5f4dae3fe89cf
 EBUILD sg3_utils-1.42.ebuild 1034 BLAKE2B 10745a9e5cb59557406583f5eba0333f75f6357cd84fc68130fd98a486938905f48c609114403bb47c918f0439169df73bf478d120d625a86e04d2c789593c27 SHA512 bad6f00df0944a54bdb692ec7e16fb213eb35c93066c9dc23123ad6b683544ec037a9703cb229bb902396b9a962f7188212207121998c1ba7a6eda9a185ca1ca
-EBUILD sg3_utils-1.44.ebuild 1045 BLAKE2B df0ea79d1386fba7d4b9903b61d3d6c2cf743bfe7d7786a5570ce0202488c1c0c4a23f2b5d96a98e2da43c0e589b12bb96fc7e1eebb737863ab003cabb0adcf0 SHA512 2fd1d84c219567c7f49daefd02007f9a6b55b4bc6e2e07fb7cfac628f9c324fc97f4bc0d88d5c0f8348ab68d8881144b0bbdb5729239d9e2d7e115d125e9d839
 EBUILD sg3_utils-1.45-r2.ebuild 1066 BLAKE2B 4871a822cc621c43c04838380cc6d4afc1360ecc851414106141c3e676d29fb236b0a7e386af7c629386beeeb8e2dbd15d083fda0deb8464901c0d3ba1e1325c SHA512 fc2717f60f31087fed00be923c0fa7e04a66928093f1a93524de9629a48f1292bcaa4a43599473ac8eb0da86ac6195f7ff5619643f30042a61598f61bf3deeaf
 EBUILD sg3_utils-1.46-r1.ebuild 1073 BLAKE2B c4f3e2e58768cb5782d1dcde03e988b1ecb7e62034b314bbfa20bdd3ee9d31baeae4ae0bb1071b2d8e05991e245b097e2ea319ef60c3a9186a0a71600cbd4c16 SHA512 c08a1f22c938da966500a9988c22e4b90acc2297fff526b828ec225b82dd40bd7ffbb1c644f416a09ad85417b52532c068912ffcdd6bd610a056e6984e98f384
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/sg3_utils/sg3_utils-1.44.ebuild b/sys-apps/sg3_utils/sg3_utils-1.44.ebuild
deleted file mode 100644
index d718000b9959..000000000000
--- a/sys-apps/sg3_utils/sg3_utils-1.44.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib
-
-DESCRIPTION="Apps for querying the sg SCSI interface"
-HOMEPAGE="http://sg.danny.cz/sg/"
-#SRC_URI="https://github.com/hreinecke/sg3_utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="http://sg.danny.cz/sg/p/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="static-libs"
-
-DEPEND="sys-devel/libtool"
-RDEPEND="!sys-apps/rescan-scsi-bus"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.26-stdint.patch #580236
-)
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	dodoc COVERAGE doc/README examples/*.txt
-	newdoc scripts/README README.scripts
-
-	# Better fix for bug 231089; some packages look for sgutils2
-	local path lib
-	path="/usr/$(get_libdir)"
-	for lib in "${ED%/}/"${path}/libsgutils2.*; do
-		lib=${lib##*/}
-		dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
-	done
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
index 09ad0a82067a..e7c8ea9961b5 100644
--- a/sys-apps/ucspi-ssl/Manifest
+++ b/sys-apps/ucspi-ssl/Manifest
@@ -1,4 +1,4 @@
 AUX ucspi-ssl-0.99e-fno-common.patch 1255 BLAKE2B 0a278c0340f2c8f7663afe25bc9478e5798e7fb51195a52fcf4a2ac887fd4d809ef4a617131f146a89095748208ecaea753746b6d4075cd528aad0ddac081a5a SHA512 87b0f8d955f4e9a0c3168d1ff7e29dd8844d34086b0aa77c2cc9b2bdbb1858a2e22e07178a18e04175e325e1e6fb4e4bacec89bdc3571dd973731344664012cc
 DIST ucspi-ssl-0.99e.tgz 112640 BLAKE2B 6db975f412723da1c6c76ff1040c27001c2d5b2b0c8bb3199f37226c31cf1e48f629aa1f8234319c844f2ccf8001d6d9ffd7700da2ae57b6cb22177cfc1e56f8 SHA512 231ef75eedc4f52f46c1f7d6f44feac54069d859da206f9ea874d3a8082dead1be310cc4b7da1148564847b5b452b691718b7ba8076a03145e2002e9250182aa
-EBUILD ucspi-ssl-0.99e.ebuild 1604 BLAKE2B fed894417661ad17f66419a88b5b8310e09ab5b22817e35caa01d14b6926b0e66ab92ce54f47f60fe8d6c245a5b340f57a2dcb19274e98195f866a233594a782 SHA512 9cb24b0d7a9bd878811040dfb12504e8c8c614180b3069ddc00b6c946f57a3aa38fd71e555238719bcb2d20da6f77b7bfac0caf4f70405d6db04c92576cc178a
+EBUILD ucspi-ssl-0.99e.ebuild 1544 BLAKE2B 94b9b13e12a47bf4e87304348d7244f0e3f089b05ff2529c0182cee6a840b44f6c89398654f047dc17d6b500c29b0857c42f5cc849bd7ff3d0048a4a5b75bc60 SHA512 8da7d9309284d294dcf7aa84a9ed88403a4a430a05d3440d16ed4357df276b58b44f5d713a34c22adfe308ca34133adb1a5ef744f43f08b0c6187dbfe11d1092
 MISC metadata.xml 550 BLAKE2B da79281578d7c1fcb0646eb789b7b12e431ae96f645e9fbd944b1c1089a9321c65a66570a0c9a32ff6502a06794422bcb1129a3edba5016ca3d7f14821058a05 SHA512 e4f99e1cb7f634dfe7252a62fca125bcdc1f7f1e868c8b9786bd4e4d7b857fb983f2567a2022fea697bb4694911807fc0099d0641cb3025558f7bf22c235d2d6
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
index 8b033c331a30..d6906bf0ff12 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
@@ -12,11 +12,10 @@ SRC_URI="https://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86"
-IUSE="bindist perl libressl"
+IUSE="bindist perl"
 
 DEPEND="
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0=[bindist=] )
+	dev-libs/openssl:0=[bindist=]
 	perl? ( dev-lang/perl:= )"
 RDEPEND="${DEPEND}
 	sys-apps/ucspi-tcp"
diff --git a/sys-apps/usbmon/Manifest b/sys-apps/usbmon/Manifest
index bfe232bdc8db..844009589691 100644
--- a/sys-apps/usbmon/Manifest
+++ b/sys-apps/usbmon/Manifest
@@ -1,6 +1,3 @@
-AUX usbmon-6-sysmacros.patch 1103 BLAKE2B e4ea9107680a108dcc15e9b53eff87dc3905b4f799335ec560d4905ecb3c848d3b8a5aab361f6602c4545d5549303d14423d75402ac4bb959737e8f7c44c7aa3 SHA512 e3a1b55effd247ac8911c07220c187bc099db011269608d09a8b6698670b5e3d1c34a8cd60acdbfd69ae3bae24ab4cdcb69927b4c9b8c573bfc7045c5e3d1a0f
 DIST usbmon-6.1.tar.gz 16358 BLAKE2B 94e7793c6ce2ef6a8616f04871efbf22c388c569834c34869d51bbf3138c4c0ce89adaaaba19fc70a2371e244a99c7fe365f360530b9366a339be3cbf291f6cf SHA512 580aa1edd6336ac86e562081a79698a98e6c7aa3dd8605a4c12201dd0e3ab1dc58b3d69f670742e007aeb76fb6ebfff9b5d10114df93814763e0c393b6473b54
-DIST usbmon-6.tar.gz 16796 BLAKE2B 14faca99b44a1d9aa33217f75633251a7932d57732780ba6d871d2dee1b48202071186704959b623f8afc276e9e7da5e4d11204b40f567057cfa731d851cc413 SHA512 4ee41379196b86697a5156d4411860ba31540b98e50165c65f873e22eee1c3caadbc73a2c61903531f968797eca8e7f95490255a0820dc0778fba82c7eb260f5
-EBUILD usbmon-6-r1.ebuild 656 BLAKE2B f9a7f8de8e36f160fc452f682d6b270427a75bf4109ea3af1741824d1c9930fd36eadb9d42c64b4e8213efb44e30af17208228e93434200a2f861d6636bf77eb SHA512 a00661e774332a263d0ace466b90551f7fb430815e7e16776bd5ebdf8315e7f1556fec798cf11f4bc15884f9ac21577c6690acd7f8a4c0c04e14b5a9fa847734
 EBUILD usbmon-6.1.ebuild 528 BLAKE2B 5adde7cbaa47e3f02dfb819778952c2259983900128a60266a372b0d47d566e274a7acce8696526e63cb692776aa2cfbacc04875ed5c4cc5da979da84a882391 SHA512 4cb63c0d3d76ae4aa892993c4044086daa54e740af0f4e8b27830128b013bed4bd3bb53f771caa891c4c2df2c8ad7473ca363acaaa6352379d94b6fe508af4af
 MISC metadata.xml 222 BLAKE2B 5000e095f9389a9ea81b6ae970f1f1587ce12f13fb4ce95ca82be803b45d9553af4c13f5ceb47eaefc780dd6be374c8b905d12aa84179ad7b58aea44c5bf1927 SHA512 05134582b0d0287f20fd3702d042ca556dc42f3ca4568bfa73f6d9886ed8027057936af758ffbb252a5677e1af876c46e8d044f5fc691148922c5fa0c5cddc03
diff --git a/sys-apps/usbmon/files/usbmon-6-sysmacros.patch b/sys-apps/usbmon/files/usbmon-6-sysmacros.patch
deleted file mode 100644
index 109b4745dc0a..000000000000
--- a/sys-apps/usbmon/files/usbmon-6-sysmacros.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.gentoo.org/580360
-
-From 449f591d0220e57face02898a9ae2617baace814 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 18 Apr 2016 18:24:49 -0400
-Subject: [PATCH] usbmon: include sys/sysmacros.h for makedev func
-
-Since glibc has always placed these funcs in sys/sysmacros.h, and other
-C libs require this, include it directly.  Otherwise we fail to build:
-usbmon.c: In function 'make_device':
-usbmon.c:966:8: warning: implicit declaration of function 'makedev' [-Wimplicit-function-declaration]
-  dev = makedev(major, p->ifnum);
-        ^
-usbmon.c:966:2: warning: nested extern declaration of 'makedev' [-Wnested-externs]
-  dev = makedev(major, p->ifnum);
-  ^
-...
-usbmon.o: In function 'make_device':
-usbmon.c:966: undefined reference to 'makedev'
----
- usbmon.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/usbmon.c b/usbmon.c
-index 37929f2..8d2acfc 100644
---- a/usbmon.c
-+++ b/usbmon.c
-@@ -32,6 +32,7 @@
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
-+#include <sys/sysmacros.h>
- #include <inttypes.h>
- #include <stdarg.h>
- 
--- 
-2.7.4
-
diff --git a/sys-apps/usbmon/usbmon-6-r1.ebuild b/sys-apps/usbmon/usbmon-6-r1.ebuild
deleted file mode 100644
index 887cedcf62d5..000000000000
--- a/sys-apps/usbmon/usbmon-6-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs epatch
-
-DESCRIPTION="Userland for USB monitoring framework"
-HOMEPAGE="https://people.redhat.com/zaitcev/linux/"
-SRC_URI="https://people.redhat.com/zaitcev/linux/${P}.tar.gz"
-
-LICENSE="GPL-2" # GPL-2 only
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="!=sys-apps/usbutils-0.72-r2"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sysmacros.patch #580360
-	sed \
-		-e '/CFLAGS =/s, = , \+= ,g' \
-		-e 's:-O2::g' \
-		-i "${S}"/Makefile || die
-	tc-export CC
-}
-
-src_install() {
-	dosbin ${PN}
-	doman ${PN}.8
-	dodoc README
-}
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-04 22:28:33 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-04 22:28:33 +0100
commit	a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch)
tree	8c764c1cc0576389ce22abd317bceba71ea5732d /sys-apps
parent	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff)