gentoo resync : 21.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-21 17:50:24 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-21 17:50:24 +0100
commit: feb0daf81d888e9160f9f94502de09b66f2a63fd (patch)
tree: b6e5c40ce2abef3da27ed50a023153f475e0ddef /sys-apps
parent: 9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff)
71 files changed, 1093 insertions, 402 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 3e04b49ff6b1..83652c1f534f 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 946cabf00bd8..d2c386fe213a 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -1,5 +1,7 @@
 AUX accountsservice-0.6.35-gentoo-system-users.patch 1122 BLAKE2B f6196cc7136581ede5437aad909a5c2baa6cda36a27d7e4ceebd0aee2b40a66ef83324b3dde92a77ca0dfca96a47ac342f4a580f38ad6e3a042384dd9e742282 SHA512 e8ac404aed1da3ab4bb092b476cbb18f2ae7d209bcbe6a30cb9058f50dce0f70d64a3de593108ef5588132389d522d19975384eb1b8414119cb622bc7d738931
 AUX accountsservice-0.6.50-loaded-state.patch 1579 BLAKE2B 40c5f1a641967fe24b740424844d62e0e559ad458651965e3ae00853ab4e226dfb0f035daeada6adaa568ac9d9eee517413770d73501d8d712a9f51385f653c3 SHA512 303c933389be6c19e01e43eb074a5e5f72f80cf3f4ef88d8ba52d07c3b6500b6d81a0a209d4abf15a46c617f57486654a74e9f17ba8b39aa438495ccbfa19186
 DIST accountsservice-0.6.50.tar.xz 384484 BLAKE2B 52c06ba85498f292204834f967211d8f0940786dc2ea3070124d3aecccd551375bfbc8fc31f23a2c3c86e23359294307656c3b927c4e819fc102d8626ae0dd82 SHA512 6e07cd318452b1cbedeacd729f0ebb200525caf1b09981abb2bac16fd90756a790ebec08aca0a0cea016f14ab27c159a68fe1332ef4bc636c5863b8c61040f64
+DIST accountsservice-0.6.55.tar.xz 97972 BLAKE2B aba3adfeb53e64455ce8e672b9db754bae4af6b4de0823cc021d0311a381ec40af04371e78f7c84eab7fb72356b26e22db78aad0343d57f65ea71a7742b51fc7 SHA512 c12e6a8e80f9b087f97238da4734d2d3a14a7c5cbd870a32a04b00116f176c818c39fb886f6dc72c3e93c136b0c2074ddf8f77e20431fa3bd54f138bea9d262d
 EBUILD accountsservice-0.6.50-r1.ebuild 1614 BLAKE2B 186817bfa9e51d665a856831cbcb537e3c671eea3f7eaa14d7549696720e6977e5b9ede900ec9656f916ebc809eb226da1e8210c9503b724db30462ca4592711 SHA512 fb1187baf22340be9c98adbfdc143288ef2e1bc4e08dfbc1c368e5718b398d6bd6f9816795760693b078cd3057d79c8ecb70dbb4581484296c761aff84088bcf
+EBUILD accountsservice-0.6.55.ebuild 1776 BLAKE2B 4282250f72efde99b74ce61ae7b5f6034abca3d6afe4ae1c282977a7f2c35f45cc36ae35354cb44b3822ac38fe3d590fc146c24e5c5fa7182e526720d13b19cb SHA512 702f9d5c2f1a182a9ff9e20483cf24945e65d23324ee3e707021be8080bb236c35df7fe2ad2f195944aeaada4dcb004f6ed0139171918b39434a9c27059f4aa5
 MISC metadata.xml 523 BLAKE2B 6117c5e7b8e0120bbae31e46c4d1e3709111638afa43c18d000c975ea0fded590ecb9404e10eca2542b5262cb122be9e34d140b6b3101ad69321cbc2f73a5890 SHA512 41c7b3374cfc02ddd842f13c25039abf016fdc110716cd9f308c4d9050a793c8506d6459c3604eae946184f3d08b2848d63b1bf65eb845f9a551c27debf1794a
diff --git a/sys-apps/accountsservice/accountsservice-0.6.55.ebuild b/sys-apps/accountsservice/accountsservice-0.6.55.ebuild
new file mode 100644
index 000000000000..8b9e10e0aa64
--- /dev/null
+++ b/sys-apps/accountsservice/accountsservice-0.6.55.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson systemd
+
+DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/AccountsService/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="doc consolekit elogind gtk-doc +introspection selinux systemd"
+REQUIRED_USE="^^ ( consolekit elogind systemd )"
+
+CDEPEND="
+	>=dev-libs/glib-2.44:2
+	sys-auth/polkit
+	consolekit? ( sys-auth/consolekit )
+	elogind? ( >=sys-auth/elogind-229.4 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	systemd? ( >=sys-apps/systemd-186:0= )
+"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto )
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-accountsd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.35-gentoo-system-users.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		-Dadmin_group="wheel"
+		$(meson_use systemd)
+		$(meson_use elogind)
+		$(meson_use introspection)
+		$(meson_use doc docbook)
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# https://gitlab.freedesktop.org/accountsservice/accountsservice/-/issues/90
+	if use doc; then
+		mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# This directories are created at runtime when needed
+	rm -r "${ED}"/var/lib || die
+}
diff --git a/sys-apps/agedu/Manifest b/sys-apps/agedu/Manifest
index 6eb796332949..33bcc0aa0934 100644
--- a/sys-apps/agedu/Manifest
+++ b/sys-apps/agedu/Manifest
@@ -1,6 +1,8 @@
 AUX agedu-r9671-fix-automagic.patch 1684 BLAKE2B ab7d2d33a7577251fa65e222914a25e621c68f6bdedbe3c9e62b43f2d8b51e29bbdbc08560fbcd76beab98e115ddf43e76e4cd290f1ce751c0452318ad8ee9e1 SHA512 61f11c624ebd5fa632f24ecc46230146f999a68ffbd9c2ce73f6319a527cd9c37d634ecec9a6b2a7fd1dcc792ab3d23a6c8a599499bab54194f36acb262a201b
 DIST agedu-20190630.66cb14d.tar.gz 180129 BLAKE2B e37e11afdf6d4e7b4169b65d547ed0fb672015118668d108081fd45728bd91cabb9774a586cdb2a44121bb7a8457cc59e2fbbc649d8585b1bb3b25207e48a3c2 SHA512 9a18f62eba86b71d54eee540ff194bb6d4292fca08ca2fc6f31e631d97e2cc7e9c63d1c796b05b0ebc529bdfe9ba9d0b34f1fd8b84c016d0ccfd9934394a7821
 DIST agedu-20200206.963bc9d.tar.gz 181308 BLAKE2B 44cdf607813153ee2a9f58f62a5f94215048eb2b2c3103f5a19fadd0aeaa4658a535e4c30f27cf2832dcdc77de0a2b3709c9cef98c0cfc13aaa70272bd8bc29c SHA512 7e2b1e909d6f16ef939bab9759880581a40f7aeb28b5ca92992f035f0dfaf2ad480498ae355239f2db0c5dfed93ee5ce732708520c5d661ebc3b019989117cec
+DIST agedu-20200617.cec3021.tar.gz 181804 BLAKE2B 19acc1ac37d09f45227e08b92483c1a0be7d9faaf4b2bf65479ca99a0294305788e88d6494508ac742a4396c4a22352d927c125ed7437fe29cb71890dbb2217b SHA512 d7a913a867817a0457c8ec3644a6986ed3632721df1040de1db96c04e85f9e59c4aba632dc1f3f3666496435b6be3f68335a2ec3e50440c844ebd4ab81b2682a
 EBUILD agedu-20190630.ebuild 817 BLAKE2B b4c2b9dc444e2dd2ba72330f9120b087870886aa6063a29fae3c85d08d438582149ea93aae1e68caf069477c992a773b2a7ccf6ce2e4662caad5f8e4dabbad33 SHA512 abda070387b4c5c403d2ed9ebeb94c391f77216e907661c7f887c80a360a429c9c3eeb0707b63496798e202ab01b059aaac562afc58a5a323eb5b5486bab8939
 EBUILD agedu-20200206.ebuild 817 BLAKE2B 036ff5fd3fd840aff6511fe908dc0ef0b926e5702acb7daa8e55db556967ae7a106449260a7874308f1b83f06f3a32d0983a6cd32df3ea7e4e689b5acca46173 SHA512 5a735912a8d5db41d99269843e25d2926ef9ef373521fc9b6e8f1a97c896c52ef7a568bced0838a388a112bb0bf9fbdeafef630321420b7646f1a1dbde3beae4
+EBUILD agedu-20200617.ebuild 817 BLAKE2B 8ae8b06a95d40ada2ac01194808b0c4f2c9b450824579e08b29bd5805573c45ac43f3a91e26e189eb0253032905882b33523ab56d2985736a93db77ec95c5ef5 SHA512 7b087160a3165e4ffa3b35fc165e41ba17b20cf052d1f8790635e77742694a8aa17f78a9c1fef6ef9a114be12c736610f75260d116cc99f60b1f38e57333c591
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/sys-apps/agedu/agedu-20200617.ebuild b/sys-apps/agedu/agedu-20200617.ebuild
new file mode 100644
index 000000000000..f33c3651492e
--- /dev/null
+++ b/sys-apps/agedu/agedu-20200617.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils
+
+# agedu-20151213.59b0ed3.ebuild is not a legitimate name
+# so we'll drop versionator and just set MY_P manually.
+MY_P="${PN}"-20200617.cec3021
+
+DESCRIPTION="A utility for tracking down wasted disk space"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/agedu/"
+SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/agedu/${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6"
+
+DEPEND="doc? ( app-doc/halibut )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-r9671-fix-automagic.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-ipv4 \
+		$(use_enable doc halibut) \
+		$(use_enable ipv6)
+}
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index 71adc20fe9ad..df8306a23f73 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,20 +1,13 @@
-DIST c-dvar-7c0833f9cae446163077b204b2296287bbee7c67.tar.gz 24727 BLAKE2B e18de53ac8014e77cffbcd9c71230847db0055e43e54b5cdfc3f48367570878b34d6fc7c299e4312708455ef2fa4ddff9fa5b48b603a05d6fbe28ce84e5e5906 SHA512 a006bdfc8a5a8e9a803ffa29f152858cb699cbf0e59d4f0550a4736ad29f85cfdef6bd8ef3cfbe8770045c76ed092db00c7338d62a8b0cd54ae5bd03f1c8b422
 DIST c-dvar-9e1a5b4363aaece7169df2b2852944a1434b2df5.tar.gz 24719 BLAKE2B 3688d10d8295bf608d091cbc808dd2a22a535a94d40fcad46735a4f9e6e58ac06f969cd4ae7e65a04dd5719d00b424d902d904553e3e83bd0b93eebf6aed0cc0 SHA512 07e5d8b0b110ae4eab34024cfef05474b6a59a931ce61632bba3d96ed6bf042edf5b21238e2045cde92f1ab91ed45b1d78e2f8fe79f527f0ab6d018dc205608e
 DIST c-ini-43f379396a320940d0661c15780f618f84d29348.tar.gz 14081 BLAKE2B 4d2b63eb5c068505cfddaa1511b95b1a3c646b7325e9efd55b4b5be85312081c148671e40157c757c45ab0128f0a486102267dddf1c3adbc8f91bb7da363a67a SHA512 bdc9412f2e43446f4dcc36f3447047c68f2bbd3c5b278671e3fb5b3d4a09d9724f362bc5d2fae44d5f899d0fe9978c559e3da57ec2eb36ee2d847bbf6af44014
-DIST c-ini-847c55f5b3d33baa47af9a1286175d58b34f91d5.tar.gz 14094 BLAKE2B 49ac949d4fc46ec63f253d48921be0acd585b3d301d56144e9477baaf81a0cfb3fb5f0706d1673c921962d1bbbeb89b2d83e07dba9265dff7b1f57da6059eaef SHA512 eec3a4d2a3e1a4d9d65385b2e3cfd87dfb482b365731bc15f989faa59fb7f2c6e88abcef6612f3718817b1d1953f12fcc9981fc36b01fa82d3146305e24eaa16
-DIST c-list-2e4b605c6217cd3c8a1ef773f82f5cc329ba650d.tar.gz 9383 BLAKE2B 70f8ed083a784a08da3b5d5fe75709cf9dcbaaee523ab9b1cd3b36931f5bb0c1e920cc38561c002f4de2efeda7b4edaf9b5fb9411f0fcd8aa1055ab966066789 SHA512 4db91e8af837d6739b9becbc2b405300e2006a82e39c01ade015eabf39ba550dc38879e800fd415bc5fa4ac220090cfdfa3a13d4f748a1278e51544c4a6183be
 DIST c-list-b1cd4dbf967d73b24dfe6cc56aaf3fdd668692e3.tar.gz 9362 BLAKE2B 04a1bca5166ad8b868ebac679e4a1c1f244bfc04ea617030a7cd9ea3765793d21cc2b1ab6c102a1e0fec65860b4d029f398ab6f9815f8fbec82608da59eb7794 SHA512 e1a852fa8e57f1fbe81f2fdc186079d6e4be9d729bb23d3d1f8450fd867dd2c04db3229fc96a80379c7199568c14df472e92a83d0925e2b2692eccc49a35b84d
-DIST c-rbtree-b46392d25de7a7bab67d48ef18bf8350b429cff5.tar.gz 26065 BLAKE2B ec5486b2e1b9b835a3aac42b9f87275bbdbc73cdb0698304db01a80f0d52bf542b8df56d6e58bd98cbceccee9418d7115e90605c8077ac8670b6326304806c9e SHA512 8177c111390f8491a3b535ec5a3b8de13a3b9d0358166494e503d68bd5748dae0cd2b092b0311258be885ecbeee2bb83a2389d9734bc28e4f78e85de3ed9b3f5
 DIST c-rbtree-fa97402c3faa18c2ddd8325eb66e2bd58a224477.tar.gz 26050 BLAKE2B 2e295550f455185eb97d1f3212d626bc7df94999fc065e814fdaa8c8d3cd14eb288f840e9cee04842cf1dc4b541a88a043d1f70eee36b77fa82f15430335372f SHA512 1fcafde26da46511dd7141280d14d96d7dd08fb7f62f71c2703c8fdb32783f9e6eac883a4adbdfb0b85139d26f89ce99291a28e789a4ec8c31e4a4560c584418
 DIST c-shquote-1d171fe52c23944c3c0be1f2603595f2488a9ff8.tar.gz 10758 BLAKE2B 1f78587e667b74cdb0dcaf82f54fc891840b75b4fff478bf315b5a45b421875ea43b07504330c35cc31c68956899d5c8e1768dcaf863ef6ece23ac56734b8479 SHA512 a0788dcbd7cdab95577564b499cca3ca1039d2b22bb05f277e84ff3868f1f80796ef26236b5aa082057169d8a9f69781f06792f9a3ae8e869d5d721931f3c882
-DIST c-shquote-34e1e25299fb82ab9fd0c8bfd8a66010ead1497b.tar.gz 10824 BLAKE2B e2cc32acdb83a9d2c759d5068ef69feb4b0fbcdf908bbce08c9229c26dc1d1d421e522b844232328b62af851ebb93cbdc282be04b26ec04e327eb59e9e5173c7 SHA512 8f5ae3554239d42ec50b093f81b13715a55215b406a2000853da5a8581a11650ba1020f06eb8f7551d0ec372e786ea6cc56c2c803d0fc86d016db69895b391eb
-DIST c-stdaux-11930d259212605a15430523472ef54e0c7654ee.tar.gz 13215 BLAKE2B f8022583c224e911ecf65f10f1ada2ae631f0dca1c0306c113a2ad1b6a996ff4fa45eba14fafa5146feabebef0ae9e275a46fa0bb78af454fc37e49c465c7e3f SHA512 7c0a5d1266462482674f9fc98ba19af65566d638e7a407969de9ccb66d5884692e0562c16b37e64269919e5c0d0c2a8ffd147e88159b9226f1bb738d460b78b8
 DIST c-stdaux-d6ecce8afbb7703e1469cc5e7a59a8bd32e2d4a4.tar.gz 13142 BLAKE2B 771c79666d4758e37204aec1149186af8b1b29979ae604b335d3b5e0f78ee934c5fa97e81aa7e4cd19f8eb88f463c2f4a507b93309ae263fae827ee5138c7ac6 SHA512 c486bdddf76522e8242da46b8057a5ee9c9f5f152962a46bb50e0e2e35be5060b8b93d0b2a0d0bcd800abdf8de6e835e68d17d83dc47c6c99e7e0b2f4d91db23
 DIST c-utf8-1f7e2ff1164bd2161cb480532b2b34cb2074bde1.tar.gz 9462 BLAKE2B 3e1429da756f82123c3aec84c2abdf02af3e131e9004a59434bf6743173082fa4a0c6d43def625da03bf0de1b3c5cfd6f00719dcfb5baced783b3d9dbbc407e6 SHA512 4221c3d366d3cb8bd61a612fcadafbc48ae817cd4770c2710a39b5bdb916a31b8ba17ca55ccac5e54ed88ee9bbcc4a9bbb3ce5b836ccfc570db28d35816cee27
-DIST c-utf8-34f5df0f4b28fc7ea6747680a432e666047082e4.tar.gz 9480 BLAKE2B 206d1b74a187e56cc1dbc6a657eb0935cbc4bf5344d4567b5aa99f0f3c559eb442e6ba2f05647f6fff1244874d64aca36062ddd290e368c4ca933802046165d8 SHA512 5b6c0de7d5b3f2a563442ca139ee1ca788a137cb0f5eede6c6e190e748dbe39b3489a2446682e1049dd6c91fdafff7743c819113eaedf370f4c3b1a28e97b22a
-DIST dbus-broker-21.tar.gz 203390 BLAKE2B 9024c5545b4a09ce43ef44f7bc78ceb52407047f88f73575c60b5ddd6f4fa188c0f65c23d787c91679d1ab2a07f8e19fa06b8a1b60b327a0cc8d79a6006ba50e SHA512 527a8b5f27458a6443c7a5ad33ac39e4e31b32348a3b4cfd6679acd9de635add272f182fe8f72b493e0812ff6e07523a35e53507f3656d05b56705ed8a00e643
 DIST dbus-broker-22.tar.gz 208274 BLAKE2B af55b906c4e6aea55717bc4bc8de13daa26ef360f6599911b7442442eb4173c3fa2c4e4058846b0202e9f45f638cc91b3a3f8c9818fec13ae09ed7b3111d1e3d SHA512 385fe58a52f3a67832c420288ef96c8ca204b5ee362eb29b38434c92483f968f76402e321fdba65cdc3d876d3e18a428d142264e5692758209be66b9d41b8e07
-EBUILD dbus-broker-21.ebuild 1823 BLAKE2B 75e72464f136f42d1d44fa982da37bc2f30fa7b8de02404800390ed5a6348259cde6be034a7510e194d7c7303f7988ef0dc191ff8eee43fbd90385a196b115a3 SHA512 9d72fd5d4f4119e713fe5a8ab0995032811d6f1a9f8a403959321b4b34ae5fe5ad83a892f70b2bb8db5cab236b4e85ca8231ccb92e43a371d2a5f3bd33c722f0
+DIST dbus-broker-23.tar.gz 209924 BLAKE2B 44f966c04c34c4dec9916224038418203b55013f07f95331b6143aaf3e4d0a5add8e76a288627f9c6458326fabf4e9db9c235190d281c4ed01a7a325c90bcece SHA512 42bcb085e153f81d59ac8f1dccd707aa1da98d01f5299eeb2fac2f12bad3fd7aa3268a489f4e1dc827c0e3f7000f11989394047ffee3c3c4da9f50bc6d12dfac
 EBUILD dbus-broker-22.ebuild 1823 BLAKE2B ae6df0b2f8b24395d2a48db5fda5d67d46a978581e9bf65fefb885c2bd4a8db1b3197cf82d089163943cbff9ca4b8c9442ef43055ae1c0223a917d525390b294 SHA512 240acf605d165c9ba33e031f62ace69bb63b1a2c0ecacfbdf9a0e90ab6cceb35e7f368f29aaccba4ff2221322e954f5742f3baa647eff821875f976d4e3458a3
+EBUILD dbus-broker-23.ebuild 1823 BLAKE2B ae6df0b2f8b24395d2a48db5fda5d67d46a978581e9bf65fefb885c2bd4a8db1b3197cf82d089163943cbff9ca4b8c9442ef43055ae1c0223a917d525390b294 SHA512 240acf605d165c9ba33e031f62ace69bb63b1a2c0ecacfbdf9a0e90ab6cceb35e7f368f29aaccba4ff2221322e954f5742f3baa647eff821875f976d4e3458a3
 EBUILD dbus-broker-9999.ebuild 1823 BLAKE2B ae6df0b2f8b24395d2a48db5fda5d67d46a978581e9bf65fefb885c2bd4a8db1b3197cf82d089163943cbff9ca4b8c9442ef43055ae1c0223a917d525390b294 SHA512 240acf605d165c9ba33e031f62ace69bb63b1a2c0ecacfbdf9a0e90ab6cceb35e7f368f29aaccba4ff2221322e954f5742f3baa647eff821875f976d4e3458a3
 MISC metadata.xml 327 BLAKE2B baaa6c7be634d16ffbe1196a29bcc2254c77d857dd1b807d50dac7adbd3d20370bf55ac0ea8f60b0fb160bf9ae69d42a5002b4150c4b22c101b37ecab96028a2 SHA512 b350af1c8be6e227fb301fca4dc1d6c90a8ceaf1e4cbf3d83ea54a302a15baa9df560d9b728a66be843b3eb679fa9536ca2f531776ee5d09753233148a0cabe1
diff --git a/sys-apps/dbus-broker/dbus-broker-21.ebuild b/sys-apps/dbus-broker/dbus-broker-23.ebuild
index 4d1e237eae1f..509831015999 100644
--- a/sys-apps/dbus-broker/dbus-broker-21.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-23.ebuild
@@ -12,13 +12,13 @@ else
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
 	declare -Ag SUBPROJECTS=(
-		[c-dvar]=7c0833f9cae446163077b204b2296287bbee7c67
-		[c-ini]=847c55f5b3d33baa47af9a1286175d58b34f91d5
-		[c-list]=2e4b605c6217cd3c8a1ef773f82f5cc329ba650d
-		[c-rbtree]=b46392d25de7a7bab67d48ef18bf8350b429cff5
-		[c-shquote]=34e1e25299fb82ab9fd0c8bfd8a66010ead1497b
-		[c-stdaux]=11930d259212605a15430523472ef54e0c7654ee
-		[c-utf8]=34f5df0f4b28fc7ea6747680a432e666047082e4
+		[c-dvar]=9e1a5b4363aaece7169df2b2852944a1434b2df5
+		[c-ini]=43f379396a320940d0661c15780f618f84d29348
+		[c-list]=b1cd4dbf967d73b24dfe6cc56aaf3fdd668692e3
+		[c-rbtree]=fa97402c3faa18c2ddd8325eb66e2bd58a224477
+		[c-shquote]=1d171fe52c23944c3c0be1f2603595f2488a9ff8
+		[c-stdaux]=d6ecce8afbb7703e1469cc5e7a59a8bd32e2d4a4
+		[c-utf8]=1f7e2ff1164bd2161cb480532b2b34cb2074bde1
 	)
 	for sp in "${!SUBPROJECTS[@]}"; do
 		commit=${SUBPROJECTS[${sp}]}
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index b15faa72cc76..bb532550ce2b 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -6,5 +6,5 @@ AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e973
 DIST dbus-1.12.16.tar.gz 2093296 BLAKE2B 46c4f0d384d76dffd31c18a2d2df03d0658479d8f5b2d14b1db2bf0941fecdc023307ec035e3f977fde570a9f6493bbabd020ac2cd81b0577597e355f5a72522 SHA512 27ae805170e9515a8bb0fba5f29d414edc70e3b6b28b7b65bbea47035b8eafa9ac4820cdc92645be6035f6748f8aa45679e1ffc84ba74a64859a3056d318b9bb
 DIST dbus-1.12.18.tar.gz 2094453 BLAKE2B eba48940c80a7483b858199156b297d97896232283988940d3cdb915eaa30bcdd13bc01f8410dcdb34193040a8bc8ce2dd45f1310aed791071e5dc5a6b38eb27 SHA512 817674e86a5d4cbfa705a79ca5197176311e47505c5da02334c2811f63b55014b582a12bce53bc73a08a3ad5061f210ba0d1e5f3bbf7697c81ca70c22a76fc13
 EBUILD dbus-1.12.16.ebuild 7239 BLAKE2B 23b3cbdf703d8afda87a03a8ef88d4ceff4f2d3544ec78174db9e1d0b8ee78ca52dd0aa687b830973842dcdc6b3c1362391c256d9acf5008b557969f9efe4a1c SHA512 ef8d1065d99cb9750b0d4145440d65d461794a448c35eaf2325bceffcf590a47783c89b7c65983c2ee66d05632a269dd7e1a580601df9c19128b30d3dfab5b71
-EBUILD dbus-1.12.18.ebuild 7248 BLAKE2B 53ecfcf48317d5ed87dc705e0c5a9ad31417a213c72ee2661f44232ac48949229a01f49c133b9a27dc8848e35c37541567247ec3f3d51c0bc0467276354d0433 SHA512 44098299f0d461a2a04bf62fe123cbbd7dd52176dc896bbeb422924557f78f44a075007c04260107c68de004215ee60ac5bec61f25dc15dae49dab8181c66627
+EBUILD dbus-1.12.18.ebuild 7240 BLAKE2B a011b8160b8f1b726494d7abce057e76dbcb4372f7e4ff32796a262af5054f7b8144bbb2edb6adb299e0127e6ec87dfb096384d7a5105f43533ed2c05405e923 SHA512 9f8a2e40db604792b55729d2f571281c5090bd65cf364381fae096fa19f88d0b444eb12cbc213aa0430d6c273d9e5b8de5aea14d0c78bad7b7cd4dde1c3253e7
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.12.18.ebuild b/sys-apps/dbus/dbus-1.12.18.ebuild
index 3b9952f62bb9..dae892d4e87c 100644
--- a/sys-apps/dbus/dbus-1.12.18.ebuild
+++ b/sys-apps/dbus/dbus-1.12.18.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc elogind kernel_linux selinux static-libs systemd test user-session X"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 4476b4c592af..9631cc55f922 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,5 +1,5 @@
 DIST dmidecode-3.1.tar.xz 61204 BLAKE2B 439e265dd3f7b225d61b5d4228c0a77b25dd44b5d3672fdd9bbe432f5ae59ac23d2abd80e40621cda934643c9819b05f34d4f5befc8a75b93ae1840caf717cea SHA512 226557ad5747a2a2eb54a938543373b9ddcff032d330ca3b9a066cc81c0e137028f606ffedc042e0220b523346e2f2f7abb0e4b8b34a8bd173719aa858519de9
 DIST dmidecode-3.2.tar.xz 54440 BLAKE2B ff5b891b28231bc50657e6fe1fa1345171109ce9baf7fa4558ced482a0616be4206ef69dcf3909611475d543b12691cc2bfe4849d8e3d35b34d1bfffe600af21 SHA512 b080c73fbda756109f0f29935c641e0b32ea9ffe90f0a8254164c9c1ff5617d042347298e6bac31e5463e94fa56efe2b2743238156d878254fc77120e6dc1a18
 EBUILD dmidecode-3.1.ebuild 1123 BLAKE2B e6dcec8395a95552a6a7d3b1e9af23f9a527883aa462050abf3bdd465148257bbab5bacfc694a6b7293564841aeb60bcfcbaca5b3a9e0ed912e23eb57d0bde07 SHA512 90324550580716ad2cc27da60d9db274a187b94420bf7fbeef2e016456150ac0ae0d5262448991ed7bd91b28aa39b61bb844779cfef932cf19011e0655c6af86
-EBUILD dmidecode-3.2.ebuild 1135 BLAKE2B f5fce2a0d646b150d84aa77ce87c3066f2b754e512af1fad908c83ab2aa079f0fe9c42de45824201c0856efc4b1d99b14b14c98a91bfec2c2088aa4242a4455d SHA512 e31c84ae9806bcaf8564bb98441540d801eb910378d063275e30070b91cf73057c1b8568abe1aa9e5856c3985724590bafaed9d116c7b24fa50cc740358a631e
+EBUILD dmidecode-3.2.ebuild 1134 BLAKE2B 01b280085bbb4b5e88a98bafecc7ffd923000568c9875021deee1013e2a5592bc5bb2baa102f7b5345762ebbf738d6c62447b3dc111894dc7924fdb2f3394b19 SHA512 c4880113ae36b10f5e4ba24272de557f5cf06189d32eb57b1278a7ca3ae9a5fdba8147d26542f8bce26bbcb96f00c31452714657756c4092b8895b67ce23805c
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/dmidecode/dmidecode-3.2.ebuild b/sys-apps/dmidecode/dmidecode-3.2.ebuild
index 8fa87962ef52..fdbf2088aaa7 100644
--- a/sys-apps/dmidecode/dmidecode-3.2.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~x86-solaris"
+KEYWORDS="-* ~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~x86-solaris"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 85baf38263aa..cc1d7b4f004e 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -2,9 +2,12 @@ AUX file-5.37-CVE-2019-18218.patch 1038 BLAKE2B 30622d39fb4006b07fabab70dfe6fc3f
 AUX file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch 1184 BLAKE2B a2b6a11c1d89ac5683422e9d9734990d5b54dc14cc295853920c5ebfe28a5de2055c889d5f708ab55d8e292a514ce51fdbd260f0e15dce74ee048fe0f8a7d93b SHA512 7a710d32232d3484923937add7dd56e6d4c6160e32da4d65cb9b4083fbc85df229af108728f3cdf9313291bdf96259c7471c1b6c4b3548033205de47e0280e6c
 AUX file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch 823 BLAKE2B c2d4c40224d2fa3db4ca0069e1f5bf111cc782879c97f642d91dc4d545544af22ed11bade5c014494838d75ac8e4d607009af77d0dc9d3457d1eb28d8e2ea192 SHA512 4ddc901be88b61ab860817daeb9f4021a6dff1473d0a64ff6409b8327e07011b1d86f2a2c54e1751d03518fa5def25fed644c1a6cd691f2737b526e43098603c
 AUX file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch 813 BLAKE2B e0d0168f41eb868131cbed1e657f4a1e4f4d1f29d22f4a4685b43a6bece5a9229a25a1d96bbc4deca065dcb6342d388ebe86e984e3dda66729f974bcc4e7a32b SHA512 eae1267cf6f49d448cad51f3ba97cd1f8598bebccc014b8702cf3ea330184718dacd1570f20efdd119951b55fe57729392197cb86f89dcce23654e745c846417
+AUX file-5.39-seccomp_sandbox.patch 320 BLAKE2B ab7c89575e61cfcaa4072b33716f1aa9af437541e3248b329d6cb44c62581ab65c7b7d455f5e0bbe95103f15c24a54a15325af8947da614c83f9f4bad7148eb3 SHA512 3219903e1c3d9f8973515871f073b54bb3396550b308dcb307d0d8cdbd7d76bbc35417e9764c8d3adc257fdcb4a5c62aa136f5175c420c54b86ea03fede6b2d4
 DIST file-5.37.tar.gz 887682 BLAKE2B c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7 SHA512 bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
 DIST file-5.38.tar.gz 932528 BLAKE2B 08d8d56e2e1b6a0c9fb0caed89ca6145bf683ecc52a639c036ded01b913e7eea75d9235851a2fbd410cbc9b929c26579b06fe1d54fb73817c951bef3544bc345 SHA512 9eeeba69cbc9f0c00a0bdf9eaf60c73a4a709e797068f109d85c1ef2a19c8b0e012ecd73714f03cbb1770dfa717e8a661ad746b644cc030cafbfb1f7aac35a40
+DIST file-5.39.tar.gz 954266 BLAKE2B 4d6d9a6317961e0a2aa391f502b0be8bbb40ede57c3470230d91aaf9ce5d35bcaceb32d551ca5a391fc8c40b64517fdb996833a8b1ca47ced7e92e9e545d2682 SHA512 9cf1a7b769c56eb6f5b25c66ce85fa1300128396e445b2e53dbbd8951e5da973a7a07c4ef9f7ebd1fe945d47bdaf2cd9ef09bd2be6c217a0bcb907d9449835e6
 EBUILD file-5.37-r1.ebuild 3186 BLAKE2B ae1dc50d4a3e863b7ad9e1732c96b75c97d780bd7b42a34b3cdf8559e21e55724df58e5cb0ec54d1ce33c33c180755803b4545fdec3026a66f364b4436610328 SHA512 58fe1683e40742719d76cb17e0d8cebbf04de75fe1c8d4c4d8873ed75c0a0f1a4f196fa74c182c170ef00a19e42e9e892ef0ce68ef7709194f55cddb0f382eb1
 EBUILD file-5.38-r1.ebuild 3397 BLAKE2B 7cd1c545d4df9e9f448a07ae492df789fe2503c81dc7ec1bf530904099a0ec25789e205e33c725feeb03671f2fab11d04052a161c895f42e7fa2994aea316002 SHA512 baef4c52a5e40e35a3cb1717f78ecb066a10513c1e75e2c69e9ac381c58fdaf1cdb935cfc51720c382ecead25ea485163d544ba6ca19ece6dc556ec7e75c32c1
-EBUILD file-9999.ebuild 3240 BLAKE2B 09f3355bc2b9ebdc2e760ace847c02096ba7b7c8a77535a23f3109212063bbd1e8b535a76e25c19a71a90afdc13766ac1af743ca325e850427ba695c53d80e2a SHA512 10c411763893d29d31aabb52da0dc579bc0a820b1cab4d535987823d915efde8c10b1b8b622a980b8d8e2d9bebc40b13182152270a86606b69d25f44f32a7bc4
+EBUILD file-5.39.ebuild 3283 BLAKE2B de652a223726670f67d97998e9285b4b997ea3809ac76a41618d9295f2635833ea98e0e93c8cad47c5531cf2babe83bbf1b6b7a20c1e9f9f862ac99a607c50d1 SHA512 17cc98d07cad36198d8069d35ef36f973290402db72561ca42c0c935d61acf6592eb8d2fa5550c457e738bcea2bbebc233870932ea4a37508fd2f0adf4ca51a1
+EBUILD file-9999.ebuild 3283 BLAKE2B de652a223726670f67d97998e9285b4b997ea3809ac76a41618d9295f2635833ea98e0e93c8cad47c5531cf2babe83bbf1b6b7a20c1e9f9f862ac99a607c50d1 SHA512 17cc98d07cad36198d8069d35ef36f973290402db72561ca42c0c935d61acf6592eb8d2fa5550c457e738bcea2bbebc233870932ea4a37508fd2f0adf4ca51a1
 MISC metadata.xml 381 BLAKE2B 242f4a2403d0a4c69c7ff400fdbd447bb7fb8572dc57dc05f3edd0c875da68433217bec46d43467fa03c5e9ec69616e3450635ff2662ae3ed830a138521e23ab SHA512 f69d67890ecb0b574d414c432df12f6e8d31ceb7755055683941017563da8713d07728e49cd4a7277699a97cd3ba732c946ecf5435cee94778a0d5652e7d6857
diff --git a/sys-apps/file/file-5.39.ebuild b/sys-apps/file/file-5.39.ebuild
new file mode 100644
index 000000000000..98499a3c73df
--- /dev/null
+++ b/sys-apps/file/file-5.39.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/glensc/file.git"
+	inherit git-r3
+else
+	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="bzip2 lzma python seccomp static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )
+	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.39-seccomp_sandbox.patch" #713710
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	elibtoolize
+
+	# don't let python README kill main README #60043
+	mv python/README.md python/README.python.md || die
+	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-fsect-man5
+		$(use_enable bzip2 bzlib)
+		$(use_enable lzma xzlib)
+		$(use_enable seccomp libseccomp)
+		$(use_enable static-libs static)
+		$(use_enable zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+	local myeconfargs=(
+		--disable-shared
+		--disable-libseccomp
+		--disable-bzlib
+		--disable-xzlib
+		--disable-zlib
+	)
+	tc-env_build econf "${myeconfargs[@]}"
+}
+
+need_build_file() {
+	# when cross-compiling, we need to build up our own file
+	# because people often don't keep matching host/target
+	# file versions #362941
+	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+	local ECONF_SOURCE=${S}
+
+	if need_build_file; then
+		mkdir -p "${WORKDIR}"/build || die
+		cd "${WORKDIR}"/build || die
+		build_src_configure
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		cd src || die
+		emake magic.h #586444
+		emake libmagic.la
+	fi
+}
+
+src_compile() {
+	if need_build_file; then
+		emake -C "${WORKDIR}"/build/src magic.h #586444
+		emake -C "${WORKDIR}"/build/src file
+		local -x PATH="${WORKDIR}/build/src:${PATH}"
+	fi
+	multilib-minimal_src_compile
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		default
+	else
+		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog MAINT README
+
+	# Required for `file -C`
+	dodir /usr/share/misc/magic
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_install
+	fi
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 0fd7e8ca10da..98499a3c73df 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -6,11 +6,11 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_OPTIONAL=1
 
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
+inherit autotools distutils-r1 libtool toolchain-funcs multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/glensc/file.git"
-	inherit autotools git-r3
+	inherit git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -36,10 +36,13 @@ RDEPEND="${DEPEND}
 	python? ( !dev-python/python-magic )
 	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-5.39-seccomp_sandbox.patch" #713710
+)
+
 src_prepare() {
 	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
+	eautoreconf
 	elibtoolize
 
 	# don't let python README kill main README #60043
diff --git a/sys-apps/file/files/file-5.39-seccomp_sandbox.patch b/sys-apps/file/files/file-5.39-seccomp_sandbox.patch
new file mode 100644
index 000000000000..da0a0ff1f284
--- /dev/null
+++ b/sys-apps/file/files/file-5.39-seccomp_sandbox.patch
@@ -0,0 +1,13 @@
+Don't call file with seccomp in portage sandbox. This will fail:
+
+  make[2]: *** [Makefile:834: magic.mgc] Bad system call
+
+--- file-5.39/magic/Makefile.am
++++ file-5.39/magic/Makefile.am
+@@ -352,5 +352,5 @@
+ 		exit 1; \
+ 	    fi; \
+ 	  fi)
+-	$(FILE_COMPILE) -C -m magic
++	$(FILE_COMPILE) -S -C -m magic
+ 	@rm -fr magic
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 750168dabdf5..78831fdf7507 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -1,6 +1,6 @@
 DIST flashrom-0.9.8.tar.bz2 473902 BLAKE2B c127a41c2857ae2e1564777b49b1eff17e2e931c8a2417e738e8188871a6ce4e0fe6a0380c2139aaa906f299ca833563df895aa5fd1af333b24bf7467de0dc8f SHA512 1a1c4513bac7cdf91326ab68b822034101e688bfab0dc0b5698f664fc766027229128c55eed94f302cac05d949647cdec6a103a423c3861b047cf0ff7cc0b509
 DIST flashrom-v1.2.tar.bz2 366995 BLAKE2B 091e01a91e12b486154ace334a5e74bccbb5f5311ad76e37f43a28167080757873d8c78b8f549d2e77eb984922c830895ba955b23eb6ee4fc24f1ffed259954b SHA512 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8
 EBUILD flashrom-0.9.8.ebuild 4186 BLAKE2B 16f9f031ff5e2e6509ac875fecff28765b6887cc215a59af53297b75cbf724f988f22981c669ae7e196bd37644d123bca7924f3f271c33718279074c6c073a39 SHA512 060e93fc378994d2168b0deb196ef9f7c4fc8af52ffed9210742539eaff8a656e8eb97b28b8fc708256231b1077433ac381c097b0966c5b64573a054d088894a
-EBUILD flashrom-1.2-r1.ebuild 4527 BLAKE2B 538a95cb683a443dbdbb9284ba88d3bed2332034c7e1f15af6fd8f62069b7598ab10547d84e6050b94de5f7ee3c621cda11a74a0ed6a9572ae37fe36a2bd87fc SHA512 3c5143084ec8059709d57ad6cbe5efdbd3acc0e7f765e41ed459425bedf7d87988fbe4757ea18b53cd33e07a3bada8484f90a92210983a6bfa7927ffe23c0da3
+EBUILD flashrom-1.2-r1.ebuild 4525 BLAKE2B af163c66773928b9d1047f2edf32a5b7583c0642741bf7af17d9a4722667b803a00767fb7cc54d1154f84fbc59388bcccecc796ac593dfab29fbdab712590419 SHA512 4ed66130386c05ec66a3f1895f32a164e002b61b7613bd93a3b2c19593aab233f4dd9d35a0be555d8ae944a30e72adc1ce07368da6994d2d9a001dea06501b4b
 EBUILD flashrom-9999.ebuild 4423 BLAKE2B fc758295685fea683f2b7bdc07dc307525571b00745ced19910a95117a033964d037da53b86ddca9482c96b8dcb6f54e46eb6401e17e5268f2b565ed89bf6ee6 SHA512 b2ef614c5bee6c83a510306823ae34b2e32e8d03726479b6ceb89f29e51c2f9d6a91f7e6c1f24166fe572094299b3bbc49047ae4c865d3ca994be233cfa7d90e
 MISC metadata.xml 4595 BLAKE2B 0a7c4f212c57dccca72a7da1172b8eb36a7027703fea6137be5eefbadf5592abaa6e9841befa3e8f8ef65b1b5057af3c0f162584f0db65addd362a0a8880e648 SHA512 25b118e1150b405d34081add86fa02c04094ada970ea2a121bf21a3047d1df2566383549df7d0138883bcfed31c2574a420e9357dccce993c93179e3e769b8ef
diff --git a/sys-apps/flashrom/flashrom-1.2-r1.ebuild b/sys-apps/flashrom/flashrom-1.2-r1.ebuild
index e732f06f2972..1415e8435f73 100644
--- a/sys-apps/flashrom/flashrom-1.2-r1.ebuild
+++ b/sys-apps/flashrom/flashrom-1.2-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-v${PV}"
 	SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 sparc ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index a86d9de595e8..5fd0db0632e8 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,16 +1,14 @@
-AUX fwupd-1.3.8-report_uploading.patch 875 BLAKE2B 460db033bdb0ea865402ce938b586221c3543e9b4e0dc4e09504f1364a4cfff81e59cf38eb9732b89075eec8000f9afdb3ccf26002f829a4ae4ecf21ce92a723 SHA512 f89718b2aa695b44a2f382e6c5f5e0114f4086710d112d33c764f8450d8c2cfc4d3b14ee87c9f76c9c155d8fd2f70c5701a267487476bae190825978080a0879
-AUX fwupd-1.3.9-fwupdtool_path.patch 673 BLAKE2B cd77da5466d8e4bfaff10f89ed983b8b25ace977644f6f93035ad61ef0178fb4324e631648fa6433af3d3219659e5c084670e6153b3c4a42d8509fbb05bebbfb SHA512 814225d098030dfabff8bd15fa7a68bc929e3f8288c8411f844c9b9994d7f539d77bdf3ef06c7079972a8905eb29dc0f7856733ac6649112a911eddb1d884d3b
 AUX fwupd-1.3.9-logind_plugin.patch 281 BLAKE2B 237c6d6f8a43408186c6707f1c373b2600bae6ad6ef750c579b7d51023615fc7f0569011aa88e73cb72030c4112f1d26e924676bc6fd1cb9e9c9a7fef76f8800 SHA512 148a5af93d2c3554239c5529d63e5f85ed70192856ca375ce0126c183babda7d7de5cf345e875f7cd88c6cce52f409f05f1689625ea6dde14bf330c9e11d98b9
-AUX fwupd-1.3.9-optional_agent_man_page.patch 1705 BLAKE2B b53e843f8495b6b5bfaef76ec3fa05b834c5989b9cf52a5e18a2dc5893dd9d87fae494d1965f71ff8007994f329c368694e9c3ae746e03e3d45bc0bef09e9e5a SHA512 b537288ff6ec860cb6d958c34b29ca4eeaa6212654c3306aba031eec944667ca3522448a77e1cba9bb9a8e65555868c291deb12adf21cc390d0f992f3fd8c08b
+AUX fwupd-1.4.4-help2man_var.patch 2642 BLAKE2B c0a8f9f5a79c84a1521fc85feb9cd8afbb58a44b9af69726c86d4c1720a202d1721d74a83e35bb431b2c4e6e56281249353975954a69145a80f8e8b9b0152eea SHA512 f9b72f1ca470ac2e33428e03d3287420877d20597a83bf8db21510e3ab4980a26f1832091a087888f38891be4e912cf29e1568fc67d2e604622c28303cb5701e
 AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
 DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de
-DIST fwupd-1.3.8.tar.gz 2246170 BLAKE2B b55df322c64947bcccc7bf05daaec2c5b2f646a4e53d757482dcd4d33e94d725315e6456bf69d5dbca3ef870437e1cc2a861537fc7af9b059497f119f08477de SHA512 0f0aa380adc5e167e49db4261b50bee9c905786afcd44b5fe221f42a77306219d40888989e0b16448535eaf077baed12de56b6cca42f91fca09c4a8384f243e4
-DIST fwupd-1.3.9.tar.gz 2254260 BLAKE2B ead64be3eca00fd2d045fb6c5ccd42d8913fa056736e6ae039feef70b6edababe50fb0552db39bf057750d3f0d2224b18b7ecf5a5a408a1f1ac3023d89687f68 SHA512 b81ef1f683082e4c49ab8acd8848118fed1383d4e3e73967daaa68927e553a5bc4973004d3dd26b268b901c5deb1f9238a98537d24cfd957162f508c9622e1e4
-DIST fwupd-1.4.1.tar.gz 2301866 BLAKE2B 057c7cdc4449aa67540719e6b7b1f073e8b247aa80dd99cb4b1c4ebf7c368c5089ddc25200bb0a42706196e3025c21a5d09f5f507d52e5c0fc5fc6d5c1eacd46 SHA512 abec0c2d66bd7e256cefa5e0ce59bbf339ea2ffb6173671c7f6cf8893b0931c16c48c47153507bc1af3f31157dba8bddf566bba1b62b8a722fa1f50780a1f921
+DIST fwupd-1.3.10.tar.gz 2255394 BLAKE2B 39f517b7648236f39df6f41b5950fcba45a1184f269e533facd752f8e132bb979b32a1420ce4bfcad5bb5d5546ea3f28b357603f7754267550fc02c2125642c5 SHA512 a30ef2933fc01136a9296e99a0b1b9220f952a058aa28339ff944633a8966678b374f479b3a93a1e63bd97491679d3ce304cb621f6e63b86238a8746768daac2
+DIST fwupd-1.3.11.tar.gz 2255359 BLAKE2B 0f91c32602459d31e53c63647762307cfe2313c553e16836cc646eb04e3ac54ebd53d2e8615afb7f43b8cd79b7e6315ed688ae04b57de851be62ed6065579ebf SHA512 e300a84a1c2d7e44e2a1d5d86300487783fc3990b20b540065f9899705569bee8996eae951f32b6fac559e76955ff9b661aa9b181e4dc0211a33a514613ffddd
 DIST fwupd-1.4.2.tar.gz 2304086 BLAKE2B 9a725cc49479984c3a98b75e9c52211a26f81d4a7ecec3b261ff4486201a967a6c82df9a1dbd591b91d9cd6eb9d1a8cd8cccfd2c8dd98d5bb3f82cb03bbd0a52 SHA512 b092eedf3e5e84874de1fddb7f14ca87975d5895721ac4f87b6c88ec7c7b2367e573b30906588f9adad4cea52da5ebbaaa4a9c38a2273e8f31d26399e719166e
+DIST fwupd-1.4.4.tar.gz 2311975 BLAKE2B 04ba05e157a1662dcd5fa8a3835701ff6c39935aa5e2d91e2aad3f7c7f5449ce56ac8f85bd4df4c3f4901c1d55d036f159eaf761761086bb1eda770021d38160 SHA512 9ce2ee8963789b99e43ebd3a76ba2851339bde6bda0c85198bbac11ebca76525385f41223956410bc1cff72318de463031f7e38b784fc5a4bf9bc2a85788db1a
 EBUILD fwupd-1.2.11.ebuild 3782 BLAKE2B f71c26237f656c291c63a2c7e46f220fbb56751ad0b2742acaf65672acd8060850f654962a26b52210a05e638ec408ff780488d83b1e23f8333b8c81a6f08417 SHA512 3b3a7897e737afc5a7bef4e8743a5a3abd67ca9d6b0a75fa1f7af65879188d1f72b5bdfdf8c46f945a8bf7b0189efec169cd3547cf9253df74d6ca6e7dba07bd
-EBUILD fwupd-1.3.8.ebuild 4147 BLAKE2B aba1f982b217a437d855cad900206a45509e2f6a1c102b24a1401aa8aedc113a8df1332ff13bdd052c21d5eebe1b62512a7dcbac2a135a0cea0d6daba29157a1 SHA512 d41f3455527b8bb26ae8ccbbef163269e774791c80a023ea3ac07cb3864582aedeec15448e53341430374bde74fe346cd06f23bab0cc5f793aab6337cad24eaf
-EBUILD fwupd-1.3.9-r1.ebuild 4196 BLAKE2B 40c1921df28ed69702666f33793937b6aeac82d02067423ec95076c92ebe10f7a2842a4c85a85b13d8e14e914b2106e9c4e1f50cf711d33d873933b84322d0ee SHA512 dc7d75a074887c8bdb9fa9536846d0d578ea1e4d3416eabbe97a3cb68a10be343909ef142a7d93c90fcc4506cc2ca716cc64b33a194c59e6f2b7ec778f67f6fd
-EBUILD fwupd-1.4.1.ebuild 4017 BLAKE2B eb969175d2aac3fd344f4377d0ace2e5dd79fb53563a1fc873d7c62366b7ad14e36481169bc18fb72e45bf9622665f1e6c815f353666ca665da604d04fb7d54c SHA512 f3fe7530dea6c037bf6c0563ba6740f49681d189424a23dae192a3620d91f070e42a5b97ca88d927584e1afcfbd0650a1f05dcb2c31850a952295217af038487
-EBUILD fwupd-1.4.2.ebuild 4017 BLAKE2B eb969175d2aac3fd344f4377d0ace2e5dd79fb53563a1fc873d7c62366b7ad14e36481169bc18fb72e45bf9622665f1e6c815f353666ca665da604d04fb7d54c SHA512 f3fe7530dea6c037bf6c0563ba6740f49681d189424a23dae192a3620d91f070e42a5b97ca88d927584e1afcfbd0650a1f05dcb2c31850a952295217af038487
+EBUILD fwupd-1.3.10.ebuild 4187 BLAKE2B 3ec354cadd6950895014084b7e8fb87e1cd32263ee27faae2fb14a0cf1fe602193b2324eba89e5d4e0736516c141ce7516c7a4ab92761b74724d50d461bbcbaa SHA512 933e85964b19c839e79671ba518970361b213039ece46aab2c936996ff7cd96a33049660eb61a3b55a8ff191db0e07a613bfd2a2faeee8aa4f84cc3b358ac5aa
+EBUILD fwupd-1.3.11.ebuild 4188 BLAKE2B 10fcb95d9ddd6158b33be98a772db66e857ff34c06d71592dc894ea6b2308c28c0f2af71ee3135b4b12d5aa25fb1c9fd7a66646e3eca427309f5b402374a3a03 SHA512 0e24ebd628dd7f48a90cd6d745ededaddf4bbdf29e6e3df5406ba92280cb5818debbb72fdaf1af71e55aac1143512077769cc4e15d76e301c0dd3276fab28faf
+EBUILD fwupd-1.4.2.ebuild 4071 BLAKE2B 972cd1aadcc8db1deeca41be037437139eafb2c02d7b0c62a0d1d2576034ccbbb50f0ffc0bdd0572bdbe3c33d8fecebcdf300ec5c203b56eaae4debe08a4d907 SHA512 fcbb325424a6fbbe5a026b5e760456172af0a1ef2eee13018af03d088923b5497f9240e32bd91c082341532c0ce249b4b5760e122f2955f772fab1e9e0721402
+EBUILD fwupd-1.4.4.ebuild 4100 BLAKE2B 31c1c95fa28b6d94584282f2f7f6b14cd6e98ef7af4ced6e171237c5f9a8d99abfb9092ccaffa1941bb108bfc2589a2acb067ba32a1de0a5ae76182a8575a0c4 SHA512 369cb4c232c3cc6e2056ad91572aba9a7758985d5cb4d1d1edf7902fc4cff06aef2d21b7d7c698b4225457b76aa24faf81cd9daf0be8f078b4c29f06fe2ef6c4
 MISC metadata.xml 1282 BLAKE2B 1c24fd3a7c2fce83628937b30dad0a9144bfcef23688ec0ef26e61bcb82252bd0ac8d339c179ea6ff22d7f4578dfc4484d87c5f1508216bf8898b6ad6de720f3 SHA512 96ee8309fc1c3cdee219428aff411e0c68f2702488f202f749a49ec51307ca604e27cbf131908b477afc9d10ee045e53f4511369bd5fd601894e507be398ad73
diff --git a/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch b/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch
deleted file mode 100644
index c0e006a7536d..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5c7e17276c8eb0c2a845cecb7d644a4bccf80519 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@dell.com>
-Date: Thu, 13 Feb 2020 12:06:41 -0600
-Subject: [PATCH] fu-util: fix a logic error in report uploading introduced in
- e076d48afb74d1447936d353f12781755f13b047
-
-Fixes: #1770
----
- src/fu-util.c | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/src/fu-util.c b/src/fu-util.c
-index 5bcffedeb..e6531c90c 100644
---- a/src/fu-util.c
-+++ b/src/fu-util.c
-@@ -286,16 +286,12 @@ fu_util_maybe_enable_automatic (FuUtilPrivate *priv, GPtrArray *remotes, GError
- 							 NULL, error))
- 				return FALSE;
- 		}
--		return TRUE;
-+		break;
- 	default:
- 		break;
- 	}
- 
--	g_set_error_literal (error,
--			     FWUPD_ERROR,
--			     FWUPD_ERROR_NOTHING_TO_DO,
--			     "invalid option selected");
--	return FALSE;
-+	return TRUE;
- }
- 
- static gboolean
diff --git a/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch b/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch
deleted file mode 100644
index a01e5fbe570d..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 4e381f2a61c6ea4eb7438c14f76b8301762a800c Mon Sep 17 00:00:00 2001
-From: Dennis Kadioglu <dkadioglu@web.de>
-Date: Thu, 5 Mar 2020 09:37:56 +0100
-Subject: [PATCH] fix fwupd.shutdown.in according to the movement of fwupdtool
- to bindir
-
----
- data/fwupd.shutdown.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/fwupd.shutdown.in b/data/fwupd.shutdown.in
-index 4c027e7ab..53b334555 100755
---- a/data/fwupd.shutdown.in
-+++ b/data/fwupd.shutdown.in
-@@ -4,4 +4,4 @@
- [ -f @localstatedir@/lib/fwupd/pending.db ] || exit 0
- 
- # activate firmware when we have a read-only filesysten
--@libexecdir@/fwupd/fwupdtool activate
-+@bindir@/fwupdtool activate
diff --git a/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch b/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch
deleted file mode 100644
index 6c9898557ffd..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From bacd3a44fe6f06ddd8bb65a3a56eb1738a65ed8c Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 6 Mar 2020 16:00:23 +0100
-Subject: [PATCH] Don't build/install fwupdagent man page if agent build is not
- requested
-
-Otherwise build fails with:
-
-  src/meson.build:196:2: ERROR: Unknown variable "fwupdagent".
-
-Gentoo-bug: https://bugs.gentoo.org/711682
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/meson.build | 30 ++++++++++++++++--------------
- 1 file changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index 46a9c4ded..e9aac607e 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -193,20 +193,22 @@ if build_daemon and get_option('man')
-     install : true,
-     install_dir : join_paths(mandir, 'man1'),
-   )
--  custom_target('fwupdagent-man',
--    input : fwupdagent,
--    output : 'fwupdagent.1',
--    command : [
--      help2man, '@INPUT@',
--      '--no-info',
--      '--output', '@OUTPUT@',
--      '--name', 'Firmware updating agent',
--      '--manual', 'User Commands',
--      '--version-string', fwupd_version,
--    ],
--    install : true,
--    install_dir : join_paths(mandir, 'man1'),
--  )
-+  if get_option('agent')
-+    custom_target('fwupdagent-man',
-+      input : fwupdagent,
-+      output : 'fwupdagent.1',
-+      command : [
-+        help2man, '@INPUT@',
-+        '--no-info',
-+        '--output', '@OUTPUT@',
-+        '--name', 'Firmware updating agent',
-+        '--manual', 'User Commands',
-+        '--version-string', fwupd_version,
-+      ],
-+      install : true,
-+      install_dir : join_paths(mandir, 'man1'),
-+    )
-+  endif
- endif
- if get_option('man')
-   custom_target('fwupdtool-man',
diff --git a/sys-apps/fwupd/files/fwupd-1.4.4-help2man_var.patch b/sys-apps/fwupd/files/fwupd-1.4.4-help2man_var.patch
new file mode 100644
index 000000000000..818a69ddcd41
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.4.4-help2man_var.patch
@@ -0,0 +1,93 @@
+From 5164e713f620972b43c54e34a653a932c968e653 Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <mario.limonciello@dell.com>
+Date: Thu, 18 Jun 2020 12:11:31 -0500
+Subject: [PATCH] trivial: fix issue with agent on but man off
+
+Fixes: #2192
+---
+ src/meson.build | 64 +++++++++++++++++++++++++------------------------
+ 1 file changed, 33 insertions(+), 31 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 7a0b2976a..9a8334973 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -166,22 +166,24 @@ fwupdtool = executable(
+   install_dir : bindir
+ )
+ 
+-if build_daemon and get_option('man')
++if get_option('man')
+   help2man = find_program('help2man')
+-  custom_target('fwupdmgr-man',
+-    input : fwupdmgr,
+-    output : 'fwupdmgr.1',
+-    command : [
+-      help2man, '@INPUT@',
+-      '--no-info',
+-      '--output', '@OUTPUT@',
+-      '--name', 'Firmware update manager client utility',
+-      '--manual', 'User Commands',
+-      '--version-string', fwupd_version,
+-    ],
+-    install : true,
+-    install_dir : join_paths(mandir, 'man1'),
+-  )
++  if build_daemon
++    custom_target('fwupdmgr-man',
++      input : fwupdmgr,
++      output : 'fwupdmgr.1',
++      command : [
++        help2man, '@INPUT@',
++        '--no-info',
++        '--output', '@OUTPUT@',
++        '--name', 'Firmware update manager client utility',
++        '--manual', 'User Commands',
++        '--version-string', fwupd_version,
++      ],
++      install : true,
++      install_dir : join_paths(mandir, 'man1'),
++    )
++  endif
+   if get_option('agent')
+     custom_target('fwupdagent-man',
+       input : fwupdagent,
+@@ -198,22 +200,22 @@ if build_daemon and get_option('man')
+       install_dir : join_paths(mandir, 'man1'),
+     )
+   endif
+-endif
+-if get_option('man')
+-  custom_target('fwupdtool-man',
+-    input : fwupdtool,
+-    output : 'fwupdtool.1',
+-    command : [
+-      help2man, '@INPUT@',
+-      '--no-info',
+-      '--output', '@OUTPUT@',
+-      '--name', 'Standalone firmware update utility',
+-      '--manual', 'User Commands',
+-      '--version-string', fwupd_version,
+-    ],
+-    install : true,
+-    install_dir : join_paths(mandir, 'man1'),
+-  )
++  if build_standalone
++    custom_target('fwupdtool-man',
++      input : fwupdtool,
++      output : 'fwupdtool.1',
++      command : [
++        help2man, '@INPUT@',
++        '--no-info',
++        '--output', '@OUTPUT@',
++        '--name', 'Standalone firmware update utility',
++        '--manual', 'User Commands',
++        '--version-string', fwupd_version,
++      ],
++      install : true,
++      install_dir : join_paths(mandir, 'man1'),
++    )
++  endif
+ endif
+ 
+ if build_daemon
diff --git a/sys-apps/fwupd/fwupd-1.3.8.ebuild b/sys-apps/fwupd/fwupd-1.3.10.ebuild
index 52570fdd06bb..008eaf67978e 100644
--- a/sys-apps/fwupd/fwupd-1.3.8.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( consolekit elogind minimal systemd )
@@ -89,8 +89,8 @@ RDEPEND="
 "
 
 PATCHES=(
-	# https://github.com/fwupd/fwupd/issues/1770
-	"${FILESDIR}"/${P}-report_uploading.patch
+	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
+	"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
 )
 
 pkg_setup() {
@@ -119,6 +119,7 @@ src_configure() {
 		$(meson_use elogind)
 		$(meson_use gpg)
 		$(meson_use gtk-doc gtkdoc)
+		$(meson_use introspection)
 		$(meson_use man)
 		$(meson_use nvme plugin_nvme)
 		$(meson_use pkcs7)
diff --git a/sys-apps/fwupd/fwupd-1.3.9-r1.ebuild b/sys-apps/fwupd/fwupd-1.3.11.ebuild
index 9e00025905ca..a16b4f0ace07 100644
--- a/sys-apps/fwupd/fwupd-1.3.9-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.11.ebuild
@@ -90,8 +90,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
-	"${FILESDIR}/${P}-optional_agent_man_page.patch"
-	"${FILESDIR}/${P}-fwupdtool_path.patch"
+	"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
 )
 
 pkg_setup() {
@@ -120,6 +119,7 @@ src_configure() {
 		$(meson_use elogind)
 		$(meson_use gpg)
 		$(meson_use gtk-doc gtkdoc)
+		$(meson_use introspection)
 		$(meson_use man)
 		$(meson_use nvme plugin_nvme)
 		$(meson_use pkcs7)
diff --git a/sys-apps/fwupd/fwupd-1.4.2.ebuild b/sys-apps/fwupd/fwupd-1.4.2.ebuild
index fc4bbdbfe909..78788fa23ce6 100644
--- a/sys-apps/fwupd/fwupd-1.4.2.ebuild
+++ b/sys-apps/fwupd/fwupd-1.4.2.ebuild
@@ -86,6 +86,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
+	"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
 )
 
 pkg_setup() {
diff --git a/sys-apps/fwupd/fwupd-1.4.1.ebuild b/sys-apps/fwupd/fwupd-1.4.4.ebuild
index fc4bbdbfe909..5ad09f23bf88 100644
--- a/sys-apps/fwupd/fwupd-1.4.1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.4.4.ebuild
@@ -86,6 +86,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
+	"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
 )
 
 pkg_setup() {
@@ -115,6 +116,7 @@ src_configure() {
 		$(meson_use gtk-doc gtkdoc)
 		$(meson_use man)
 		$(meson_use nvme plugin_nvme)
+		$(meson_use introspection)
 		$(meson_use redfish plugin_redfish)
 		$(meson_use synaptics plugin_synaptics)
 		$(meson_use systemd)
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 394aa53ba837..3c167fb4579a 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -2,6 +2,6 @@ DIST gawk-4.2.1.tar.xz 2985412 BLAKE2B ea0635904ae8af8943d545b21affbfad64de5a688
 DIST gawk-5.0.1.tar.xz 3136004 BLAKE2B 1dd8a9bca2488f2d3c946406b01fcbdce0487922ece49fe2121c39d6d10bcfcb6a056edbbf88ba6c22772ef88a250fc8ffcba33ead399c0d7c8f5d19d0e896d3 SHA512 ff9842a91035f843482d93eac8a35cddf2ce16acaa43a0112c1efff08802aebf705ee70d47eff74a190dca7be330c31f7204ad27cb63bdee65333f9b9c984212
 DIST gawk-5.1.0.tar.xz 3154564 BLAKE2B a969b03f45e1d830d2b3760d75530de97eb521a35ac448cf441d7fd2d1a8c1059bd9240cb9571f58ef6ec122864ced3d274a07453c3138177deda895ac3433d9 SHA512 971e6a7617eb051d587984f64be2ff830e49eb60721c3401e8944401e3c3a7cd3334f0334b6e28bfc9283aaff15d83b0933f1fd77b0f8c7059068fa3f94c3cb4
 EBUILD gawk-4.2.1-r1.ebuild 2164 BLAKE2B 09cbe472e3e9d6bcd194c27ead1d1d96f4c7eed3e5fb5ab68f0301b33cff378424c4caa92aa910c14675294d504a22cfb30067b70eb78121be681c640a4396b3 SHA512 f26f73852c3c26f7efcfb69bf11b6738e0bd4a9e03b22df753477160285675e35654c38f6777551f8607f8680b087a91948d2089e83c00e7474ef8645952cd65
-EBUILD gawk-5.0.1.ebuild 2225 BLAKE2B 937e55c0c745b60996adf2cccca365cd81a6bbc77103b6428f4ace9b56591fd72bcb4e628f78e2f5b0a945511d04cc705ed44968a9864c1aa9aadf37f06ef516 SHA512 2f9a48b3280843616624321860a22327bb054d775559b8df0b8b849bf1926dfabd1c5d42a541608b24c5986e27298110cdf9ee9636c159125d8887897dab7606
+EBUILD gawk-5.0.1.ebuild 2224 BLAKE2B 1f393d6a908ccb2253426edd54254a8bde7c2d9ccf5a607a53a29c61ea896691901cf5e6ba6b72ddb255650f9942443cc54d5c7d1e8f7725e89f475b4df1c856 SHA512 ced61e17c22b7bbc3753898bab6036be08b3256d234518f76287556987a891f33ddeced6a21992bb04fc1c15aa2e28b76b96cd0b16038f81a2dc3ddefee01dc3
 EBUILD gawk-5.1.0.ebuild 2280 BLAKE2B 29352fd90acca40f4986842737909e282d1d082685e49ba35c125ccc0d30c575ed439e833100d3673d398c9c74b8c6955137d03e9afa93ceb605930e1aed6f54 SHA512 6249b492dc57bdbf408395711dabd0a1787372803d81b5852a78599dc1fba228a2c8acd2ca43862be17bdbd95829213c7ab1702061b0a4ef33cf20ebb9397e95
 MISC metadata.xml 347 BLAKE2B 3b0515d5ca37d12fbced19fc573e31fee27137e618aea3db03395a6bdecd8ad89d0d231fd3bb566ee993704a57b090a32697016885456e386b2c33ec37761b64 SHA512 1150e37d64393f26ef81056ff25e9720a4bc82dd28c9cffd164d144bb6d2f660f802a31d5ebf4fd121a01b36a4a5073893ebec6b735d3eb570da36705d5f446e
diff --git a/sys-apps/gawk/gawk-5.0.1.ebuild b/sys-apps/gawk/gawk-5.0.1.ebuild
index 45edf5b87361..a26f77d0a7ac 100644
--- a/sys-apps/gawk/gawk-5.0.1.ebuild
+++ b/sys-apps/gawk/gawk-5.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 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"
+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="mpfr nls readline"
 
 RDEPEND="
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index 43b57f651377..2874c71c601d 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -7,5 +7,5 @@ DIST groff-1.22.3.tar.gz 4188772 BLAKE2B 28c380d33719f4eb0c91a9761e76beb9a2f1f6f
 DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
 EBUILD groff-1.22.2.ebuild 2792 BLAKE2B 0319d0b38341ca672e408b4c5ff2d92e71c2d6adcd0f282a1e128328e3af485f74737ca7b7d5b48ab227a04911bbabe153671dd548e3af2dd84924bc77aa0cdb SHA512 8903afe4bbc5ddbce88b85f3098c2d0172aee6b2da98196b7bf913eedcde939720b2fb0d16276817097bc3d1da6d350e38599bb452d0f9d1165539a76ecb9d33
 EBUILD groff-1.22.3.ebuild 2506 BLAKE2B c72c5bbfb1fc6b733be04ca30862c42367b67417547b602f955807e5ad1ea5af8535bdf8188b68949d7f1a59e07427ff17011b8a45454f3fe9fc50436f97f996 SHA512 b79e10a91f4a4af83bb24f39a7265dd72a986d3a1aa400e2829b7a5b4fc4beca1b9dcf9099f5c263260ef15da006eaa7f5e2b0ecf91dd94a004c24ee24fcc550
-EBUILD groff-1.22.4.ebuild 2556 BLAKE2B 9948483af8066b331f06bcc2b5e0e11a7b29106e0afc1b44f98e182b168d2744e588a0a37bc25bd30969a6375b422d0c0f5429ac3add517c96e7dc23748727c1 SHA512 173b811215828951df752be1b45dfa2253ed8ec73ec91a5e93751479aab4235d59fa622e758cdfe86f6db683bddbc97c42fc054d18b410ec8fb9f30e49beb1f3
+EBUILD groff-1.22.4.ebuild 2555 BLAKE2B a5697a196faf1923d3e14e0a6ceb8df48926972296895cb483b091d97f8429b6bdd23c2c94c1cd691f7c7eddf4c0c900f0d10ffca606da6e0fbe2f4b00aa830e SHA512 209f5592785df2a50c21196f49e4ce87859e718f864aa715df5bd07129aec40a6257d2fe3ee1480032bdf5af04f60e55c0a68518cc32909028aa24e462f195e3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index 7de6e592f425..f97de5f3c1ba 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-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"
+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="examples X"
 
 RDEPEND="
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 9fe1c3d84021..780c7377acf7 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -3,11 +3,15 @@ AUX haveged-conf.d 207 BLAKE2B 0c6adb8c4e4f6d769e2ceb039b4a553c2e75bfdecd277c16c
 AUX haveged-init.d.3 322 BLAKE2B 7484eee6c17a5c6ecf20fa656b8c3976c732ba40f370d92635517dc14dfaab1b26778f660d03389a7bb1df217d78e9ee5d8a03934bec3b53f0edc717ca8f9ef9 SHA512 057cafb7f74423759834d470664558dcf16d226fbf1f47f569bacf04a8f76334aacc7fc25348d055847f6da4c644383b0519d80a7553058bae5264508eeb4ad4
 AUX haveged.conf 147 BLAKE2B 7bdf29071f7a1a3b90266af308ab0a0a56c46f8c9ae8b6acc3b4055a89ac14c0e3cbc2e370d344debe8fb69f9ceacae6882c17d2620e0daea171d349073672d4 SHA512 052696a31ab7b9a0dda06ccb24c08524bef0cfa9c601a1ba6819bb2e42886a6b3d9b77710880d589534fae3c600d123304586f825fac554e68ce50d8b5acd563
 AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415abbbdeff3794251e911c6efee7d9331a4cb1e8dde1dbb579f46935cd52c58fbaeb77404b587985cb SHA512 7d7caaef45cbf268a1c1a813537a9e4ef6543addcfebe99fd178e37a8c516bbd5419fb8f47decf2370cee0562f066c72501b6c176307b1f5884b56f561386b88
+DIST haveged-1.9.10.tar.gz 495820 BLAKE2B f3ef9d566275a9174ab3a3c280b3af234dcd1ea45408c18ea990d40f5e919fd97030802037932118631b204332a4f0ceb2090e64286ba3f361b63ec1bba9863b SHA512 d45ca46dfd596e4984c457b017952c195236f7fa84fb7a6d02ec47fa8326c63aefca700ae5872da11c35b2b1c5705514ea036a080a27e80f64f1a010831997e1
+DIST haveged-1.9.11.tar.gz 495008 BLAKE2B 65c2eff3deee5f06f437086d4ec028072aa7e7adff0e0748d437b8c38f191cbe4d3c8ade67aa6f9d0d12a5940dd5bd88fe6f619ddcf62ddd59a31a0cdaa5aabd SHA512 2ddee986d45049313246d9d84f23b5ed1257bb815c0716c7cea53b86e7bbf31b718d268ee45e1cbc87d2b9f1fbf7389da34ede72ca1ca044ccc6bd82d2943f01
 DIST haveged-1.9.2.tar.gz 494682 BLAKE2B a972d128b19fecc3d01e17bd4cf6d5ec03ae716c4b4934c73193e03f3d3f9ff3461a8280ec0a20885499fd334343deb193ddc98b0697b2b14f92fff897bbf59b SHA512 65f70950fb90ef9c24ff3bf1b26e19a9cde2bec4749e2e64d5461a51646a20cf610efa2a5014219b8605957afa0084abd2ba11c7dc15f9379afce784971627b8
 DIST haveged-1.9.4.tar.gz 493215 BLAKE2B e1a8bbda36c35523c7a0c72a1377d7006440742961f9be4527d52b7e05b176334529ee032f5bdf902e729fcfe045a7a0558dfea7c50a95019747d1158f1e4a19 SHA512 20017c7637779c0cfa414233bb67efb2976f92c08e4eb1b7ea41ccd483dad755629d8e05fb8560a2db811fc2ded7d05fa081ab10c59341cb4c206595a964641d
 DIST haveged-1.9.8.tar.gz 494473 BLAKE2B 3c656221ffc896a1c57cfcfa17524c1e40de04fc5cffa94ce71e0bf11a78b578b9f11f8e7683f2be7150d5ccfeba9eb2f553d9379006f2624bf78d5ed152da74 SHA512 6a4012c7ab0ad7df77ae61dd3aca072a7aeca942c180d37c8495009fad13a4c9c0e7bf64a3ffce00e50c06679d4b948c3930a960789a06edf074076cf68d37db
 DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa
 DIST haveged-1.9.9.tar.gz 495495 BLAKE2B e0cf1a68cfc91b5a0aadb424024c44980a312f5bc5f680f0cba50edc97d82fa9cfea09fc09988cc2e4b02b245471f2a6847d518503fd33f596fa8a00069587e5 SHA512 0d30c2effb859f4960320a4681a368973960c17afa295704ec330a1bb792848ba3be5ab5428274b9dddaa5c6d50447e8bf99ff5de14c03a8d59cf87cc7a4e4ce
+EBUILD haveged-1.9.10.ebuild 945 BLAKE2B 8dad88810d8e0bafe8655c51e8c5cfe98955ff6712f884254302c22655f880ad94481a4041454f2a1599eb8c25d36ba09ba914764fe6ee735dfa6d4b622bebc2 SHA512 ac291a8be5d047d7965817580e1131ed7ef067893275cb27fa50af48dcc601f9c9eec56009e7230a1679ba34d0b3fb5801af9ab18452de591662ca6ee50aba4c
+EBUILD haveged-1.9.11.ebuild 945 BLAKE2B 8dad88810d8e0bafe8655c51e8c5cfe98955ff6712f884254302c22655f880ad94481a4041454f2a1599eb8c25d36ba09ba914764fe6ee735dfa6d4b622bebc2 SHA512 ac291a8be5d047d7965817580e1131ed7ef067893275cb27fa50af48dcc601f9c9eec56009e7230a1679ba34d0b3fb5801af9ab18452de591662ca6ee50aba4c
 EBUILD haveged-1.9.2-r1.ebuild 960 BLAKE2B ca6650ea624b8ca6a372ace436bdef5c2a956fc627a16a2ccf8083a0ea3e147f5cec9571b560a5e423e1a4abd36337d632d74ac4365aa7c141a8fe81d214d79b SHA512 e18f627765762c3b64f34319bd3756bda5963cb861f6fd04a3d2e31a736bd19d99d9ab4dc3690563dbf9fbd11b750431cc808c9252c5f043c6dda4b0654c2a28
 EBUILD haveged-1.9.4.ebuild 977 BLAKE2B 9f9328f7fb42a1d625c5ca0413d11d8dd18d4ae4e9e6d3cffaab2b9969ce63359d30678cff3287f8bcbb36fca724e47af5167b6d21e5b08b8f18004b515ce299 SHA512 01517dfcaa91e879e18e9a330f4d7750e9e1a2d9fdf6f1ae6bd11cc44b4dc0a978363576fce2342feaab489ca5e335ac1fe2df31105f09388d261a7727c32930
 EBUILD haveged-1.9.8.ebuild 1010 BLAKE2B 6cf51da54096328fa8c4cf7f10c7be6b3c8e40eca18bd94111f0d13bf81d1fcb78d6ec99b0b60f4944befa185d15664777656cbc1952c95f27d7aa5cd9541669 SHA512 ee5fc0487504822b832479f216c703a95af2f02fc2768cb2aaaaf0c51b4791cb73b9379390db4244227bcc22a6ba03be84e7df6b028bda2ad94e2d90357d2ec5
diff --git a/sys-apps/haveged/haveged-1.9.10.ebuild b/sys-apps/haveged/haveged-1.9.10.ebuild
new file mode 100644
index 000000000000..c439fda13266
--- /dev/null
+++ b/sys-apps/haveged/haveged-1.9.10.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd
+
+DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
+HOMEPAGE="http://www.issihosts.com/haveged/"
+SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="selinux static-libs threads"
+
+RDEPEND="
+	!<sys-apps/openrc-0.11.8
+	selinux? ( sec-policy/selinux-entropyd )
+"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		--bindir=/usr/sbin
+		--enable-nistest
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Install gentoo ones instead
+	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
+	newconfd "${FILESDIR}"/haveged-conf.d haveged
+
+	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
+	insinto /etc
+	doins "${FILESDIR}"/haveged.conf
+}
diff --git a/sys-apps/haveged/haveged-1.9.11.ebuild b/sys-apps/haveged/haveged-1.9.11.ebuild
new file mode 100644
index 000000000000..c439fda13266
--- /dev/null
+++ b/sys-apps/haveged/haveged-1.9.11.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd
+
+DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
+HOMEPAGE="http://www.issihosts.com/haveged/"
+SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="selinux static-libs threads"
+
+RDEPEND="
+	!<sys-apps/openrc-0.11.8
+	selinux? ( sec-policy/selinux-entropyd )
+"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		--bindir=/usr/sbin
+		--enable-nistest
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Install gentoo ones instead
+	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
+	newconfd "${FILESDIR}"/haveged-conf.d haveged
+
+	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
+	insinto /etc
+	doins "${FILESDIR}"/haveged.conf
+}
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index e6f4dfdbc8e0..1ad9e01efffe 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -4,9 +4,9 @@ DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f
 DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967 SHA512 aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68
 DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4 SHA512 c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce
 DIST hwloc-2.1.0.tar.bz2 6272755 BLAKE2B 3ab13bd5cd00c4c19a1c4b1de21fb799038bd0afaa86520696478eada8d0ac11a4f4de11b96b0d92495b431f4b49ccb4185b176ad5abb9372ba6c5c9794ef21c SHA512 3fda7c4152c3f1b701c3da0fcbbe7e1dffb502042cb86e9a44ce6df8e227c005333e61d5459407f88efbd56816db0ab90b19f75d047e0c77b3b7f5c6405ea501
-EBUILD hwloc-1.11.10.ebuild 2197 BLAKE2B 2cc8b6519ea866167cbdd58145472354c8859da5017f932fa866017dbdb2a767312b90e4941b6cf88cd7eff9e05ac80b2b56d8b62121a805ee259ba1f62334fe SHA512 054ced91ae7819579dff0091f116c2ce09400202a23a2e2936c5bb8ed9469151035c724a3ac5b550f6b434825e35de9f4d43ad6a8c63aacb2af6bc5e0a562466
-EBUILD hwloc-1.11.13.ebuild 2178 BLAKE2B 293f6b2a4235d0d52fd05b0a301b0aba23bd544871cbab2b74cc2298ab4154efe509a0789e7533a66a8a82b335ffa3bf642082b8d3cf0f07eff40751f20a9153 SHA512 985d07ca0b35a9510273d490b1a81a0f874aa45182b9acd62767e245e1a0d8f68063c8d1279f12349c98f05665d62a6d4578aeea4e6a558e6068891267122a36
-EBUILD hwloc-1.11.2-r1.ebuild 2142 BLAKE2B c0276f7d2e8500896e855958f173e08cfb87242570a60d46de7c2e575d7b94349505b5a5377bd2c805fee60c4a9be29cc6d8aff4f034afe8b06e0e3c9b7bde85 SHA512 78faaccd2f66eccca1e4c72603786c9161e43b6a76f11cf6dd01b292e67a116ff1649076494065713d0b52b123495982efef9110d35d7aff32e34d83ca81c0b3
-EBUILD hwloc-2.0.4.ebuild 2049 BLAKE2B c243ba4020853c7c0be9d7a8e2cd5b8fa9889b5e8d7c15bdf2fe24fb72124704be6c8d0484fd33d600e2cb43bfb5e2f3116aa312e8e8f98743b537c0ab63d80b SHA512 95b962abb0200bc1f51867734e80cb0d8caf959655fcc757dfcf1865721f69797adfe53c1e06d3fedfd840f903c97b6a0537b1be438b8422cb6ecfa5625bf672
-EBUILD hwloc-2.1.0.ebuild 2426 BLAKE2B 00d97b65e0a78e2087e72ceddd24fb0f79f8ad1e816cbcfd96f9cdf35193ffea0a76d9eea2b4ee3dbbd632312fd649cc7da2dc3d5c7d6d7b4054124c238814e4 SHA512 e0c01f8c62232fe7f7e2f7d3d1f93c9b01a6315f7d5071808182406eeab17cd620547e727019bc733adef7bbdf3f4285b9fa27ea453b8202b80877662d79e8d2
+EBUILD hwloc-1.11.10.ebuild 2170 BLAKE2B 60cdea9ee071aa1610a48085e9b6dcb2f38a8cd473095df9d6db3d804f8d84a82e5d576d90687c09a224274999e652bff2e153b513c948bd83f4be11ad6512df SHA512 bf49f0c3c7d95de2ff4d707655e87f13b64848e19f5db9f46eaa0f015c13dd9272c357fad4bffb220eed964f439fd655b43a21e2ca731a49dd9ce7ed4b6988a4
+EBUILD hwloc-1.11.13.ebuild 2151 BLAKE2B cff35093263a6d6f14076b1ecef088bac4f822f20128a1a3a6e0ec9441cf45a353159a79d38e219fad958457efcd3f0f1dabbed5c9b9dd2911c264c2bccd9135 SHA512 2d4285d3dc899f4138de3347b919e332535af05a199773a49dac7b06a643e3af107b35e11ddede47026e204f9f85e1080f171cbfcfd0e7fd195ca3a5d94bc276
+EBUILD hwloc-1.11.2-r1.ebuild 2115 BLAKE2B d79a58930fc0bc95065af6d3f2344ae2678f61e87d962668400a00f7118697e13e49d58c8a48215518af17dd477c282ea9551ad5d31d6f17e329e7006cb050d6 SHA512 775dc6c380f2bd41ef012abd1fb7efbe486f6e7489d08cdda3e79da3d640248950349120d699b19651d60eeb61dd05ca4a0a9a3e8c76535746a6390064eedc2b
+EBUILD hwloc-2.0.4.ebuild 2022 BLAKE2B 81e1daf91440f2cff13e3301915b0a2069396b98ff5ba33a06ea418d07ae606e0b6de85632e356a81b142978143d22e1fe11fb9d33343cf6da99d551d116d286 SHA512 bcbb4c5e522983c39ede9b6ee5723d359118a599a2b2c22351d80d59fbe67987a592a82d04513ac5e78e37847187dbc20bd903ddd94204c60bf0de8a9b733f77
+EBUILD hwloc-2.1.0.ebuild 2399 BLAKE2B 962fac7338357c0a66e239f0ceb05f7906cdc2dddd459f48191cd998c2d79f2666a5f1356443fb4d13922e5448c7ebb70f2b498e98a80a30fb931ccda946d9dc SHA512 62575ccd7482649ac50f78b6bddfe19016d8f7387d8f3de603f374e7cdef29d7babc2066be26c5386c5f2f7b91fddae22ebaca17aca9c7758991dafd49192bb1
 MISC metadata.xml 1758 BLAKE2B ba3810fe4f1739add73deff3e6557d5a4c8efae8ab855c587f506c3079b97a1eae245ab7c3fab984540b5bd2e8be4e72fa2e3a33fa1dbb8be296dd2ed5ec1d30 SHA512 bff4e0dbac83c2c1a1e01ad284936f56f79580f3c1dde11bbe75276dd6dda13490cbfad6183b7ad6a4962a4875488a291f090e8e05816973836fce5c257dae8a
diff --git a/sys-apps/hwloc/hwloc-1.11.10.ebuild b/sys-apps/hwloc/hwloc-1.11.10.ebuild
index 6eb8bb41080b..c3630b9ccaa1 100644
--- a/sys-apps/hwloc/hwloc-1.11.10.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.10.ebuild
@@ -33,7 +33,7 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
 	numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
 	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
 DOCS=( AUTHORS NEWS README VERSION )
diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index 5ea06899c88e..6d4a1f6d1025 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -33,7 +33,7 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
 	numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
 	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
 DOCS=( AUTHORS NEWS README VERSION )
diff --git a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
index 48b8f6e46a3a..a447cda89521 100644
--- a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
@@ -33,7 +33,7 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
 	numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
 	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig"
 
 DOCS=( AUTHORS NEWS README VERSION )
 
diff --git a/sys-apps/hwloc/hwloc-2.0.4.ebuild b/sys-apps/hwloc/hwloc-2.0.4.ebuild
index b70355bd1d6a..c412bfedcf48 100644
--- a/sys-apps/hwloc/hwloc-2.0.4.ebuild
+++ b/sys-apps/hwloc/hwloc-2.0.4.ebuild
@@ -30,7 +30,7 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
 	plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
 	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
 DOCS=( AUTHORS NEWS README VERSION )
diff --git a/sys-apps/hwloc/hwloc-2.1.0.ebuild b/sys-apps/hwloc/hwloc-2.1.0.ebuild
index 9a3839b7e14d..d996e67548ae 100644
--- a/sys-apps/hwloc/hwloc-2.1.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.1.0.ebuild
@@ -33,7 +33,7 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
 	plugins?	( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
 	xml?		( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
 DOCS=( AUTHORS NEWS README VERSION )
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 4c3122c921fd..32553b17cc72 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -5,6 +5,7 @@ AUX iproute2-4.20.0-configure-nomagic.patch 5835 BLAKE2B e21e79a5f804b4f3ebd8233
 AUX iproute2-4.20.0-no-ipv6.patch 1334 BLAKE2B 612fa64a897fe8c601aca529a09508cc865f2f0fb7cb865ba28f3369748086622b6910f25052047c972f495b5e20014cdf6e9f73b230124f372cfe6301bc0bf2 SHA512 f4b42667d4433225b2e4272b6e629fc43b73ede02ac0e706d2e46d81ffcecd19ca45b8b9789904b4bd6d10d34c82239f9b3c33cfcf3f9e5b309d828a3494c864
 AUX iproute2-5.1.0-portability.patch 1117 BLAKE2B 8e3a2f275ffb774a30165f46d85ad01f7cd3a932085519255f661dd898462ccb5e8f11c2a57e015d6c19d8c917c82eb76f4b9c779ff91b4cfb7b874fcdda3088 SHA512 5e46e5870e41c15213f04582f40bef18c081f5058f8b530c844fab4f42f56935386f461f0d46f33d17352eebd79a167bb9b6f1edc93bb62b805283cc3872f4f9
 AUX iproute2-5.2.0-fix-sys-queue-h-on-musl.patch 2579 BLAKE2B 86e81152b51a2566060469d4585ab092be0f5a62bad11a24e086bf2cdea78db7494dc5c4692e3c71ed108732ad3a59e444c423eaffd356c919ca82445de75f6a SHA512 9b0875781f20c0a3773d9c0b0f051ce455fcbf3cedb92a411ce9c873f162ca6b25ea8c564fa971d7c56e6e3effa3a9cb0a3057518a16de264b100b7b73a7d64c
+AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1bfb9d92379983d989d9d4a396e773f02c655ac14c57cc25c5d4e37fbdb0e0d1cb1d35fc94ee70077b81d1285ac2d58cb1b19fa69db SHA512 09a9d450179b06c434a41b7bdd8d4a47b8ca2303de3d08b2b101e8695aec28e5d1e454a8c62e1b71d66b6e776dc6975f2837acc0a0f8a2a3f1e31b1eb56b71e3
 DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 2d0ece5dd8f1beb7912d025c269a9edd2ecd87aea04971a28eca9f9b7ea82d0e4aa397c9338c0cb6cb463887678a541a5407644e82244ffbbae0eb8f6ac088e8 SHA512 47c750da2247705b1b1d1621f58987333e54370d0fff2f24106194022de793ff35dfd67fd1be127ce019008705702092d31dac49abf930a7c0dc5c7e7c0665b8
 DIST iproute2-5.2.0.tar.xz 729540 BLAKE2B 72d082b4f39b6b9f0040149ea14d3c5c6d999eb4955b708ef49a3276f3c574eab757e2c81f10a11e2ce5f709c7849bbf6556e40c7f261fc72d498046f73eade4 SHA512 82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1
 DIST iproute2-5.4.0.tar.xz 741328 BLAKE2B 8c7b74aa64526180e793165eb3d0f1ee07d4589fa982aa91e4e0775595c096d73677e85bb7f073cbe14e6de6b166d31efba94554f8c7df3320b168341818fcba SHA512 26d1230e10d9ba4466edd3fe95cb6f595df691eeb27b87ae845ceb9da09fe11c2e0daa8d67187121320413f9ee7131fd426182055eb285be7c4de558d9e47051
@@ -14,6 +15,6 @@ EBUILD iproute2-4.19.0-r1.ebuild 4372 BLAKE2B 3ee6b85303fea1bb9cc680022001baba11
 EBUILD iproute2-5.2.0-r1.ebuild 4480 BLAKE2B 9ce5e16fd42e39f9539a0ebeb5b626ad10f8b814414039b35c424fef64b3434fbddd37d0e11f9021cd90967f14b2c1bcdbf96b18f64d15915b7cb943ea86f7aa SHA512 f81aad4109e869d1628d8425bc09bc7c285463719dc600a89f4ce5dd855fe38715349d80aebb0011190bc003fccad8744a345826e8789a0f3e6e7f584409a997
 EBUILD iproute2-5.4.0.ebuild 4423 BLAKE2B a52726d1e562962789fe3f8ebfa2d8ae7e9c65a4355e45a0d8351a31cbf46e7361daa9dc103235052a9cd9754b815d12b924f5aeee96406bea4a41c8d164a5a6 SHA512 6814b86e90dab9cb3600ff58b1dbb43197f2696051802639cc4602245ca96db28b1e4e117935504a4acf1c52d6ca9a8599162dfdebe5799b1a6930a95a0039ea
 EBUILD iproute2-5.6.0.ebuild 4540 BLAKE2B 5a56182135bb0e83de820d889b40b7c0ba12a6c3b3c783c871d50b0fa98dcacdfaacb9e6345fb79ea788e026838086e4aa940a8ec1ac560ed4bc3451b237cae6 SHA512 ba67ace9de9fe1d6d2cae65161dfabc77942896a4ec5f7a600342cfd7479c909aee13526efdf2edfb4648ebfa02d98df8b6d04b6e0361c44f8ca432293ee7242
-EBUILD iproute2-5.7.0.ebuild 4441 BLAKE2B a5ad7bbdd8f462eaa1cd5fb8d49ea8941743db34652609c36b5add05c383d2cd6584970df34047b074309414c5c52ca687b23cc8ea432514e0435ee1caa71513 SHA512 eb7fe8565a30aa2864364fdc556dbcd3e20d613992921cff2b46772e17c96ec8aede27017fa992b59c1cd122b267acc6ef222706cd1f62aca88c64a04b982ae6
+EBUILD iproute2-5.7.0.ebuild 4495 BLAKE2B a6924b4ba1fc0323026a130d820b5dccc9d81aafaedf20154b320a744327bd3e273431b8e5a95d30e5cd34d7708cb3e2dbf0e0181bde0c9d1e9bc01328c3f426 SHA512 e4c9a3b718cdbe1893749a8669e119e2e1e4a68612cf657fb00c3778e53598cdf150497651eb77e13d8eade420413f0e5f663156f70a03dd6af4513a27e4c75b
 EBUILD iproute2-9999.ebuild 4441 BLAKE2B a5ad7bbdd8f462eaa1cd5fb8d49ea8941743db34652609c36b5add05c383d2cd6584970df34047b074309414c5c52ca687b23cc8ea432514e0435ee1caa71513 SHA512 eb7fe8565a30aa2864364fdc556dbcd3e20d613992921cff2b46772e17c96ec8aede27017fa992b59c1cd122b267acc6ef222706cd1f62aca88c64a04b982ae6
 MISC metadata.xml 672 BLAKE2B d27b6af84b177e8b12f64470dbac0e8fdcf45091681ced6d5ebd02414849c221e608a6a4bb8ce6aae305475e086cf140836b943a9e5380f10c368ac359397a98 SHA512 d71c5077fcf769520048a46b0fdd3563b974b65afdc68eb73fc0816d2c87dd9a73bca72e25d7e8f3c9f2ceb23c473bb92a1a92d8d5f43a7e15f965669226f0a2
diff --git a/sys-apps/iproute2/files/iproute2-5.7.0-mix-signal.h-include.patch b/sys-apps/iproute2/files/iproute2-5.7.0-mix-signal.h-include.patch
new file mode 100644
index 000000000000..be606c107fc2
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-5.7.0-mix-signal.h-include.patch
@@ -0,0 +1,10 @@
+--- a/devlink/devlink.c
++++ b/devlink/devlink.c
+@@ -15,6 +15,7 @@
+ #include <string.h>
+ #include <stdbool.h>
+ #include <unistd.h>
++#include <signal.h>
+ #include <getopt.h>
+ #include <limits.h>
+ #include <errno.h>
diff --git a/sys-apps/iproute2/iproute2-5.7.0.ebuild b/sys-apps/iproute2/iproute2-5.7.0.ebuild
index 7dcb54c51f5b..6a78d7f40fb6 100644
--- a/sys-apps/iproute2/iproute2-5.7.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.7.0.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
 	"${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
 	"${FILESDIR}"/${PN}-5.1.0-portability.patch
+	"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
 )
 
 src_prepare() {
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index b0e41ad114a3..6d7a9c8bde93 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -3,8 +3,10 @@ AUX kbd-2.2.0-cflags.patch 990 BLAKE2B 2512eccfd4e2eea843e176951f6e6fa1f74d2fd28
 AUX kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch 982 BLAKE2B 6a52de79d927cb67420a257d5becbe50027c838878e1baecf860e30feb59a1913101e1f650974c5bca08f579c1dd4312cc60f77c12a6c860281b3fcb0fdbf072 SHA512 caeef9531f8bd926c655a7002b4b96b9d49aa94b7d7e063347d920bc869751059fbcf4578338bbb9e910f936b62485bbe51713d4956577dcd6828ad075b4f6ed
 DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f
 DIST kbd-2.2.0.tar.xz 1115220 BLAKE2B d4218f3a8f9212d16e8a14011f0e136f6aebd18f13f8d5da2bd63296e0aa857fc5e7fe927200345fca3b723bc879f87511b02c152824a73ae5743cc8175991e6 SHA512 5f407c20739487e423e8390e429d30838a1a69a0a50db083803ce56da919e25ce480b63fd1bcfac9eb362095f17e575783b09eaa55e26b442bfa3ed838e04f13
+DIST kbd-2.2.90.tar.gz 1636546 BLAKE2B 8bfdd3d09e38a0b91684fee481f63e8118b2a37568f2e9ac28c164256033449fc035c2f2179b0a15d4e1e4c28a5fc00c1906c1b47e97bb9b76cc7eae81f453d7 SHA512 dbbbd0bd0d293ce7fa9f6a03b5ea2213e6beb01917137a13f507939657afcab8b69b759691755d85925c87276b4e43637ff840c24b1de4ca4e2c4a301e050926
 EBUILD kbd-2.0.4-r1.ebuild 1536 BLAKE2B 3bf3fb6e985557b4ac62a75fc64d9e9608716e5914ff151ab11af68bf16f499e06216bb26da494b39f93d032d57fc8b9a74680196659d76d48b8ff5460f26d7f SHA512 a0e5b222f7321d5094a3dc67737b09d6ac1e3881029bbc402feeb58a4e269d3dfb103cff0fddd5c962b0c0cbe8345e986ead373b1592b1a1a82c7e2520f34257
 EBUILD kbd-2.0.4.ebuild 1374 BLAKE2B 604d3d89c6a4a5f579607bdb03563edc51f3d29731dab80e1b202ceaa1658c70c48f84bcf09c8de958ce3acfcdae79224718897f21ef07803eadf07d900428be SHA512 f568ee8f7d27ee59b2c3e408c602a2d4daf8281964dc509ce251b7dd6b3fc35e6babae2c0f5023d6bd0453a1fe842c992366cf7cc633c21145ded70706d80384
 EBUILD kbd-2.2.0-r2.ebuild 1601 BLAKE2B 4164b0070547959848ef4b8adc05f8ec1ae3e8785bd1d4c9801f9f3ad77a3e515afa51c3e5eb86ec60d4877c14cf4d2d89d7473b1b2d31caafdb04b0f5aae9e7 SHA512 c323e91149fa0842e5b7587db49759e3bb61e6d36fcf74d7df17f3f6fe0c69877abdb50502bc04cd2f3a5878c52eff36f8586f96c04aa15349081454c11bf2f2
-EBUILD kbd-9999.ebuild 1520 BLAKE2B c6a8e6d3af2c8405246c1e78c30e0038c8c1eb577e784f21013cff3a05d95cb933f03de14b1a00185a5d5ba67c45959d9309535cb89dabb49e0a2441839f64dc SHA512 b529efa980ea07b9a72db12bc564dfa9eb2e5eaa02b18cdbfb649148cda7054923e39a5125b6f0786c38527067aa25dd633658d6bbf370755675747ebf53bf0a
+EBUILD kbd-2.2.90.ebuild 1699 BLAKE2B 652e68d5c215b1a8c72f69aa50d338f3e859fb35e1b3c3b8f684909adfc8fad17d528bd4a6990cabe87177b7bdfd0fa1391a4a50d71792457900cbb0667777a6 SHA512 7b757726aac91df126742c41da5230d00a2f712b2b38edc193926c98b98a7acc57982dff33b530df86780b0839d57593e4cbcf9f2d1afe1ac3d979047d076eec
+EBUILD kbd-9999.ebuild 1699 BLAKE2B 652e68d5c215b1a8c72f69aa50d338f3e859fb35e1b3c3b8f684909adfc8fad17d528bd4a6990cabe87177b7bdfd0fa1391a4a50d71792457900cbb0667777a6 SHA512 7b757726aac91df126742c41da5230d00a2f712b2b38edc193926c98b98a7acc57982dff33b530df86780b0839d57593e4cbcf9f2d1afe1ac3d979047d076eec
 MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641
diff --git a/sys-apps/kbd/kbd-2.2.90.ebuild b/sys-apps/kbd/kbd-2.2.90.ebuild
new file mode 100644
index 000000000000..32395a108a73
--- /dev/null
+++ b/sys-apps/kbd/kbd-2.2.90.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit autotools git-r3
+	#EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"
+	EGIT_REPO_URI="https://github.com/legionus/kbd.git"
+	EGIT_BRANCH="master"
+else
+	if [[ $(ver_cut 3) -lt 90 ]] ; then
+		SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	else
+		inherit autotools
+		SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	fi
+fi
+
+DESCRIPTION="Keyboard and console utilities"
+HOMEPAGE="http://kbd-project.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls pam test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/gzip
+	pam? (
+		!app-misc/vlock
+		sys-libs/pam
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+
+	# Rename conflicting keymaps to have unique names, bug #293228
+	cd "${S}"/data/keymaps/i386 || die
+	mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die
+	mv olpc/es.map olpc/es-olpc.map || die
+	mv olpc/pt.map olpc/pt-olpc.map || die
+	mv qwerty/cz.map qwerty/cz-qwerty.map || die
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] || [[ $(ver_cut 3) -ge 90 ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		$(use_enable pam vlock)
+		$(use_enable test tests)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	docinto html
+	dodoc docs/doc/*.html
+	use pam && pamd_mimic_system vlock auth account
+}
diff --git a/sys-apps/kbd/kbd-9999.ebuild b/sys-apps/kbd/kbd-9999.ebuild
index faad110fb541..32395a108a73 100644
--- a/sys-apps/kbd/kbd-9999.ebuild
+++ b/sys-apps/kbd/kbd-9999.ebuild
@@ -11,8 +11,13 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/legionus/kbd.git"
 	EGIT_BRANCH="master"
 else
-	SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	if [[ $(ver_cut 3) -lt 90 ]] ; then
+		SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	else
+		inherit autotools
+		SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	fi
 fi
 
 DESCRIPTION="Keyboard and console utilities"
@@ -53,7 +58,7 @@ src_unpack() {
 
 src_prepare() {
 	default
-	if [[ ${PV} == "9999" ]] ; then
+	if [[ ${PV} == "9999" ]] || [[ $(ver_cut 3) -ge 90 ]] ; then
 		eautoreconf
 	fi
 }
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index af153f469f1a..eb440a9c7d7c 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -11,7 +11,7 @@ AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc0
 DIST lm-sensors-3.5.0.tar.gz 267133 BLAKE2B f8fe8efe19cd17f2c828404bee7b2b285118279f06aaa2ebf831823d6767865a2b19da7bede1f3b43b2664ae3cec41b9e840be24fa673472fe577d38f602da4e SHA512 bea9b2ac01bc43622cafdce0b00ac3bb8cb2d818449c8b332ab51e7ad0022b66bcbf6ca1e99c8500bdc6092c5c1ef985bfe7cff05dbcf015bd3ccf58c00a72e1
 DIST lm-sensors-3.5.0_p20190505.tar.gz 269694 BLAKE2B 6d665b8cbf83b26786686c5000dcac139aac930f691bac9053173dfcb92b6320afeb2f9b5ba6305cba643ff8cde356ef9e6772948d0f618cb3f5a48b3b5396f2 SHA512 15e3c50a9f00d284995f1ae34ef38e1ce314acb0c15d4996002287fadcf89a6f066058838c74c2b2bbec2628a3e5b9e8e010b0f5139641ee5336ac061cb33353
 DIST lm-sensors-3.6.0.tar.gz 273209 BLAKE2B d05efa2bf5f052158a9b3f8bbe925d45a8e00fd7fb07490ddf6c87db786c803fbe8a728693f36c301269b995c72d510657d02f2e94fbbe5a7e9f50a36214635b SHA512 4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf
-EBUILD lm-sensors-3.5.0.ebuild 6480 BLAKE2B 821fedf6773cc6712887d0e77a47e01ffa5fb527aefe9c401fe48963171a3f8a349362c7fa893c10e48ff36217275c9e90fc714c2a9eb5a540d0e3a5aea674c4 SHA512 ae83724161791d4b5766f6270c44a3a7cb557f695a3a877d1381afe755b995155d15fa2c1377d556284ec0c4fc5e36551321f856061f152da3618931d8033d79
-EBUILD lm-sensors-3.5.0_p20190505.ebuild 6443 BLAKE2B 1e6a8d6da3395666bcdb15971e390e08c9d95c8b6c588f248b63f5f26cb7b5db563f4e776045bea91a0a0fb2fdfeea46f5baf68f0f75fd95bc5c10a76e17336f SHA512 21c3006352737df9174ca25772e54f25f1f74688a6fb5b37e273d6070d30ac8952101e419d7f0f0dd86a74ca0dfa0ea0cf6cda9a1e41419a35b03095f55aab8c
-EBUILD lm-sensors-3.6.0.ebuild 6437 BLAKE2B d175ffc95808996f91a41b3d2a8c1323f5d55bc3db319c052b6f33139a8eaf49436de35be965126bcf3b448b7964f06b146f24c588a8fa6ce6c0e3d9260b991b SHA512 cb781c619fcdc21d45c160ba255c3c071ff493d227fa73c83b6f1923a1fc8f9b3efe1d629c9d38ba39f87eb94b3706f2a83b472d5f7d0e672ca36c8d0d042ba8
+EBUILD lm-sensors-3.5.0.ebuild 6481 BLAKE2B a28ee881c1e8fe7de8b68e68023e580b2958cd155b36221cfc6095e7229bda353fa0bed2d42b65fe1b609abd492bac0b06d08569b7f9b9839e2851f0fcc8e806 SHA512 a462ecf888eaaafbedbd1c79b35a5c0b9c2c1038a22abf980e2998f813853ad76545ea5d3351daec64366eae801f619435b197fcd59ede44f44ec369f8c66ffb
+EBUILD lm-sensors-3.5.0_p20190505.ebuild 6444 BLAKE2B eb3ab6b35813340445e4331395e385dd2fe0c69b42de7b43eea71d6df90ad38042a0b9256c352c11f25ed0d0c174291e6e5ab149164f55bef27855c60e761137 SHA512 fdc1508af3da4697989db7c00ea9abe21cc91e7ca79d8a3fa761c4602c026359d72e1f342a34332bb951b0ab8e331f555fc7bc05fb637a3df54de510b5367fdc
+EBUILD lm-sensors-3.6.0.ebuild 6438 BLAKE2B 38e60f1727acc1bc94724ed30a81dcc41ac00bd42e232e322db6b9945bec4b4e668c828deef2968bba5939c7d8904e46ba64b33f8ba2dd01f3f80ed5e4d2d07c SHA512 fcfffa1f4f21a04d92f1680f7a669b48937eb7df8401dc12bbc553287524e582678369ef6124a98deaaca20025508d8e941dcf762b1c9bf18b94c05b058e9ab1
 MISC metadata.xml 943 BLAKE2B dec9c9764069667a9f5f5cd8359d0dc06020d6acbed972daab0b538b9f172f6d081a057cc6c55362de11c26857d1a885bb8a04e18dab1062370a8ddf0e25d7e8 SHA512 c32b85e2771b216861bf16d8c7ccfc8277b34c7ab712edaf487083f8d9e2a8e3707b65d1dd952e92d925fbefa87cf76799aa0b30f11ae8acfd4ffe27f2caf1f8
diff --git a/sys-apps/lm-sensors/lm-sensors-3.5.0.ebuild b/sys-apps/lm-sensors/lm-sensors-3.5.0.ebuild
index 68d5821774fd..33d0ed4735dd 100644
--- a/sys-apps/lm-sensors/lm-sensors-3.5.0.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.5.0.ebuild
@@ -137,7 +137,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake \
-		DESTDIR="${D%/}" \
+		DESTDIR="${ED%/}" \
 		PREFIX="/usr" \
 		MANDIR="/usr/share/man" \
 		ETCDIR="/etc" \
diff --git a/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild b/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild
index 6a87092756dc..29ca56868a23 100644
--- a/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild
@@ -135,7 +135,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake \
-		DESTDIR="${D}" \
+		DESTDIR="${ED}" \
 		PREFIX="/usr" \
 		MANDIR="/usr/share/man" \
 		ETCDIR="/etc" \
diff --git a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
index ee16374173e0..2d6758b9f09a 100644
--- a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
@@ -135,7 +135,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake \
-		DESTDIR="${D}" \
+		DESTDIR="${ED}" \
 		PREFIX="/usr" \
 		MANDIR="/usr/share/man" \
 		ETCDIR="/etc" \
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 58cfdb21f543..a9438743f7fc 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,5 +1,3 @@
-DIST osinfo-db-20200214.tar.xz 99572 BLAKE2B 0342b35c5e370d98a23ccc36c72233ac2d92d11d30330b6188101cd9451e7c557849c3d1d65c0d469d6539c5b4347a4fc16eb7a5a92493bd5a2a887fb19ade08 SHA512 b51f62f2d31b4da9cc6162b3798cdef0993b7cea2c884cbeffb4e81de027bbd077ab1c3d871391e456b41e87bf2a3e80244c01a49f39db53285cca0596ec09b4
 DIST osinfo-db-20200325.tar.xz 100124 BLAKE2B 89bc55dc4af0943abc59bdf0cbba070bb133129900269477dbb598e623b41b313cc41283d5e22c6a3277a7cf420baf294bf275c2c3e6f11ca98451c0ffa5b16b SHA512 c192a3814063f60d7ece0b912035e15d98c8363ff10e5c5ea5aae97ab10d95b85c5837c496f3dc4a26d3626df06559960b138986d9f4727b3d0477015e29cfa0
-EBUILD osinfo-db-20200214.ebuild 668 BLAKE2B 5bd9f45c5745d97052e35df92fd9a6d7dd413816f28112c7574f310e792e905ab0b64f8198e968435d9c48c2d3b599edd0a9bf220be99f073ce7669042e9c79b SHA512 27ba85e90d6ec6079ef998b26cf86263345944644b93d86411e029ad8366b3e4570e349abe7579c27c31e5b4200f1b5885ce6dd9ccb7dc46701590b35571990e
-EBUILD osinfo-db-20200325.ebuild 671 BLAKE2B 1a1edab17c338bbc4067cbf99b89e362307a142f5c53c2ad2dd72bec89b88a13843b66a0552156bc1c7d3437641cefd767d6c3877d93cd7216fadc2b1c3c3da7 SHA512 a46832e3fbb2f8e5eb6632632896faeb184da58a01a1297fcfee5151b6235578a13ae413a2a48031399da2be31f050607cf7d71c32a65fbc944eb9d45d14a04a
+EBUILD osinfo-db-20200325.ebuild 668 BLAKE2B 5bd9f45c5745d97052e35df92fd9a6d7dd413816f28112c7574f310e792e905ab0b64f8198e968435d9c48c2d3b599edd0a9bf220be99f073ce7669042e9c79b SHA512 27ba85e90d6ec6079ef998b26cf86263345944644b93d86411e029ad8366b3e4570e349abe7579c27c31e5b4200f1b5885ce6dd9ccb7dc46701590b35571990e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20200214.ebuild b/sys-apps/osinfo-db/osinfo-db-20200214.ebuild
deleted file mode 100644
index 32c869734dbc..000000000000
--- a/sys-apps/osinfo-db/osinfo-db-20200214.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="osinfo database files"
-HOMEPAGE="https://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	sys-apps/osinfo-db-tools
-"
-# we don't depend on intltool here, contrary to README, as the tarball already
-# contains the processed results with translations in XML files
-
-src_unpack() { :; }
-
-src_install() {
-	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
-}
diff --git a/sys-apps/osinfo-db/osinfo-db-20200325.ebuild b/sys-apps/osinfo-db/osinfo-db-20200325.ebuild
index ee488fdf635f..32c869734dbc 100644
--- a/sys-apps/osinfo-db/osinfo-db-20200325.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20200325.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 99f6451ef72e..8e6967b40d7f 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -5,6 +5,8 @@ AUX pcscd-init.7 408 BLAKE2B 54e4995a169b7f816b0de9b409ae94a8328e792b50872d58398
 AUX pcscd-udev 330 BLAKE2B 50e99953aec238fe98c6aee5219d3978b44d37c90ce74c9cb8e19b37c8677001e9b1b3701df8246bf051c6cf8b5c971f86bf1f580bfcbff270b8937328ca887d SHA512 06b672135fda9f83af4f030ff8078f8e1194ced529334c17c1a93f81ee9a5d4448bcea5ffec398f01d957a6607fbde7f69fbc23d727bb3ffad48a305cefe5c26
 DIST pcsc-lite-1.8.25.tar.bz2 757099 BLAKE2B c34727833206b4c868e4f0cd6f8bcaf6899695a92488df8e2fc815c00771ea2f248d9d5fa457c02fc437b8350cbfa37390e07f45b90d08630c8afc34b247034a SHA512 0da63cefd70d9524b2afabd62c5f404758c805b84bbe9ef64fb801ef91a8934c38495513022565ea31bd8550b23bc95b9e9b098ddc76930e3d0643c1fbfb5deb
 DIST pcsc-lite-1.8.26.tar.bz2 754838 BLAKE2B 98bc1abdd66a08dde479821f8b1ef489980a6d58d2a624902de12d0862a4e11b47ed7b12eceff438ecd794bd78a91a7a376e7f4c78c1b03867555dd0e5b734d5 SHA512 23f9f41e08f6a5ff1840bec621ee37d6eb268e4ced58df516eb7e32cb6a84998a1d04bafcec36e6524926963e6730a25301301d364b6bd4dda8da1caaa76f037
-EBUILD pcsc-lite-1.8.25-r1.ebuild 3036 BLAKE2B 19eaf6a4bb2beb23c3d05177eb40ec71fb150f8f5693a61ae5c3aee5464f407349adee4dabeb568cfabf2de2ab9d8bc0723745129654e94b0b4e1c7b8fdf2cf3 SHA512 c4edcc9bc8b6631286827d4ceac1029c23799f05c19885368747312bcff3d88363bc44e0de64583a7ede9e5977da3bddf575245e7a37cf91969169d48e94a9a5
-EBUILD pcsc-lite-1.8.26.ebuild 3137 BLAKE2B f64a41e1b9b863ffe2ca36c547a5621477907cd30a92f61985432b9c792e27eb835895d3a90a7794c6500e8ad294b75fc629b4520d23b420c587e0a3faa97072 SHA512 06d55b8fee47982b5e6b1273d8e64b878792e6bad7967a3169605385e7d978ac94426f76ed66ae2162d1dd814b309184d694b55edf3499b5275c70ce5cd270ef
+DIST pcsc-lite-1.9.0.tar.bz2 755963 BLAKE2B 30d027ac61aba1f57224c88ffc4ec8568dcc2747f3f7e24be07e7ce52bd23ad7a71b6a2f78d912f827a4c02a22c13ff16bc1450c02bafd92bc87ac0e34a2bbcb SHA512 35c85b15ab54c14403a080d6671b3d986910372651d46a5477111172d42c6d2cf58f4a3ce95427e7a84f6b4d3bee30ea57bf69b855f753160a3c6e72f93e34f3
+EBUILD pcsc-lite-1.8.25-r1.ebuild 3079 BLAKE2B 5642ba00c4bc84504e086b20fb51b8fa7a41a3520cf775a9d5c9468850353c2a523be009ea1dc15f22278d76159ba4062760db12fc9fd8f8c1dced65d6e3afe8 SHA512 39f505b6d297fd7e8e66875fd09cdb1346ba4b1609e6adca5a1a2159c2b04cd9ab54e56248d37985dde6c81d1eaf31e32927a3c5be0370a44614f41de6256dce
+EBUILD pcsc-lite-1.8.26.ebuild 3180 BLAKE2B 3c285edc804c8588a7e5bc262fe80ddf7eaafa17cd613cc3a4907e6ef9b495687f1653d444fcda99141b3e463b3008abf632d170e77af4453f29e6e2bf9d5541 SHA512 445b7c85f01dd5f7e74f82edeb8b08e575244a450c99e09f8d6f2043ab99cc09a3f0e1c0d3adce299bd470e93ee0fcb9e172467a3d91c320ecef67ae3af50d80
+EBUILD pcsc-lite-1.9.0.ebuild 3176 BLAKE2B 8e9989505d0254c3b099773d104af4983942a0a54d7741789567ab54a75c884ddd593b815e0c48ddb2de0913128968f3b0f4591fb16cb3153a47ac46577a3023 SHA512 bab30a2b775d01142ec08abd35ba4618fc40f11bb335007f7563dfc1902774159d9ee5e3350930d20a593c5ab0d66d7e7812c98de2c88bc0c5937e2774b54327
 MISC metadata.xml 1078 BLAKE2B b47112f9457ca29308517a6cbac1502a83bb8c3ac19f95db1788d0695808c07e3cd1955cbe0ea2f861e6cd9a78cab793f9fbeb699ffb0952d1fa4c3372b8ead9 SHA512 b1804b8e9ec6044221e4158a0127e1dfeb2381d264383f3ba4faa69d6a6ac8a1bd0fcf7681dec92ef7105c05463191bb6e890962bbf419f839d47d51f1d8f7d2
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
index 6f50b0b83455..17cdb4323e71 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
@@ -76,6 +76,8 @@ multilib_src_install_all() {
 	fi
 
 	python_fix_shebang "${ED}"/usr/bin/pcsc-spy
+
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild
index 24f7453b0356..df54b9cd2376 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild
@@ -78,6 +78,8 @@ multilib_src_install_all() {
 	fi
 
 	python_fix_shebang "${ED}"/usr/bin/pcsc-spy
+
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild
new file mode 100644
index 000000000000..1c65ee7590cc
--- /dev/null
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit python-single-r1 systemd udev multilib-minimal
+
+DESCRIPTION="PC/SC Architecture smartcard middleware library"
+HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
+
+SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
+
+# GPL-2 is there for the init script; everything else comes from
+# upstream.
+LICENSE="BSD ISC MIT GPL-3+ GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# This is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="doc embedded libusb policykit selinux systemd +udev"
+
+REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
+
+# No dependencies need the MULTILIB_DEPS because the libraries are actually
+# standalone, the deps are only needed for the daemon itself.
+DEPEND="libusb? ( virtual/libusb:1 )
+	udev? ( virtual/udev )
+	policykit? ( >=sys-auth/polkit-0.111 )
+	acct-group/openct
+	acct-group/pcscd
+	acct-user/pcscd
+	${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-pcscd )"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
+)
+
+DOCS=( AUTHORS HELP README SECURITY ChangeLog )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-maintainer-mode \
+		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
+		--enable-ipcdir=/run/pcscd \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$(use_enable doc documentation) \
+		$(multilib_native_use_enable embedded) \
+		$(multilib_native_use_enable systemd  libsystemd) \
+		$(multilib_native_use_enable udev libudev) \
+		$(multilib_native_use_enable libusb) \
+		$(multilib_native_use_enable policykit polkit)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	newinitd "${FILESDIR}"/pcscd-init.7 pcscd
+
+	if use udev; then
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/pcscd-udev pcscd.sh
+
+		insinto "$(get_udevdir)"/rules.d
+		newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
+	fi
+
+	python_fix_shebang "${ED}"/usr/bin/pcsc-spy
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
+	elog "the pcscd group, to avoid running as root."
+	elog ""
+	elog "This also means you need the newest drivers available so that the"
+	elog "devices get the proper owner."
+	elog ""
+	elog "Furthermore, a conf.d file is no longer installed by default, as"
+	elog "the default configuration does not require one. If you need to"
+	elog "pass further options to pcscd, create a file and set the"
+	elog "EXTRA_OPTS variable."
+	elog ""
+	if use udev; then
+		elog "Hotplug support is provided by udev rules."
+		elog "When using OpenRC you additionally need to tell it to hotplug"
+		elog "pcscd by setting this variable in /etc/rc.conf:"
+		elog ""
+		elog "    rc_hotplug=\"pcscd\""
+	fi
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 0a884c78c11e..f1ca04f3989d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,9 +2,12 @@ AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a7
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 DIST portage-2.3.100-bug-719810-escape-percent-signs.patch 1486 BLAKE2B 809e3897ffbcba32bdb209bad56e32f10c550bf00e74aa48e518c35d697447d88cb110652cb621a67b3fc9d3b97afeb0c593afd1212854623445899254a851de SHA512 37d5d67194ff2dbeb637da59e20d6fe2f75a69334189e751db3329b76b3e0ac42c6d87a0f1fdeeecf9e17288948e5d5b8415c53035f0f60d81f00c4e76e26b7d
 DIST portage-2.3.100.tar.bz2 1051559 BLAKE2B 32ee47c2d3e28dd7530c4d6518c264f01621677b5d8872c98088117de3bde21bb05f144935b1c035157953814573473a9ac0216595138d804dd30cf8a7c5b4a9 SHA512 b784ced00676020700a27a622a7a10162b8775185e28d639473243949ca32210458523e94960cafa908ca4a97cd8731d3515f768e2512c519c54598316ecf3c9
+DIST portage-2.3.101-revert2-bug-709746.patch 25365 BLAKE2B 84a451b3af5c6a79a99f7548fa920a888b76d31d4248d11592bf5e8ec8f26bd8e62f813cb69a684ff2816942c49a8661744c7ec9d0944aa256527cfa3b20323d SHA512 49a1f7e38cec1e06373154024a980eedf5bfacc9cc66e1f8c70e8cbb77c68b94a934b4cffe039acdc86179a8f44bd463771c3acecaab6ced3387fd47a312f69a
+DIST portage-2.3.101.tar.bz2 1052483 BLAKE2B 8abf5a0f5c3aace92fd5e74692240558b9fd6cc27f5030409289519edb5287e6b49a0e8c33d11d7b1427a8463fe98f6041de37638451fe639b295d7b595328f3 SHA512 e5d373fc435a9f7535c9bdc202bd0aa9a534ac9991987e21fbfd43492940210312b817284a2484cb4e98854050bb559aa49daef7f5d555e637a37eb312ccbe61
 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
 EBUILD portage-2.3.100-r1.ebuild 8506 BLAKE2B c28cf46a4b962d3cc63c8b2761830ec23102b2fd2bb62812e93323307449bb2e40e5ff89e28addfa19f99da7e29fb8c11ff262d0b2a129e1d7d14b55ebcd5a10 SHA512 d3b5ae4297c201177d831c50df9e5d78475025fcac3fab8a07970363f60da72ad6850fe74996791040eb24518617b915bf01b74ef3ebfb172ec72f6fc79d91a2
+EBUILD portage-2.3.101-r2.ebuild 8524 BLAKE2B 66747258d25a467f7672574c132983ee7d00107fa0d435511d8c7b70e44c2e949485f0ef461c5b232aedfe55c5afecbdd3b1ffa76bbc67cf23ccc6272fc7cb99 SHA512 1b4a33f9b134b69c48ebdd71bc4c30bcc8c2d4968ac4fa9eec087cfd0f753aa1a34751789f225b0ea7d07ec7276c3c6739dc22ce9b60d5b379c1fbd76bbc262f
 EBUILD portage-2.3.99-r2.ebuild 8464 BLAKE2B 4d8dd4abded851e705f4a5dc7fe7692acecf16f0a47a08086589e7d6443ed28c4adc97d94a2cbbd7e5a3e36e4a04d80402502739d4a2b75b7d6ebc2ad20f50ff SHA512 884218ac0eb74afe5bf9fb618164e0fd5fe368afeedcd93d5bb50e50b473f98c8b5b890cd44a8610b08e0d557c2ca5faf5842bef0fc3ce44ea5777a974588058
 EBUILD portage-9999.ebuild 7423 BLAKE2B ea03765f419e9450349cb5cf956f6f86f73a2ecdd95be109edee4713de5d57fb38f1da502f6d5aa0ba3bcea28ee1985efcb252a40af83982aa36fcfecfb92c73 SHA512 4494b11c180586cf6b1f268a2f9c54926ad57a4d41f74841b2644026ce8f18b8044ec5bd0048678bcd3a8c97cb1a9a1b6c5b63cbb637c2af948fa6fcd13ac0d7
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
diff --git a/sys-apps/portage/portage-2.3.101-r2.ebuild b/sys-apps/portage/portage-2.3.101-r2.ebuild
new file mode 100644
index 000000000000..e3ec6c3b452b
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.101-r2.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 epatch linux-info systemd 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 xattr"
+
+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
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14[${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"
+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)
+	https://github.com/gentoo/portage/compare/1079f2d13cfe575e243b76b2f5128c0c4e222f51...ca763549507d995e91a49753b13bcca8748fae6c.patch -> portage-2.3.101-revert2-bug-709746.patch"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	epatch "${DISTDIR}/portage-2.3.101-revert2-bug-709746.patch"
+
+	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
+
+	systemd_dotmpfilesd "${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/systemd/Manifest b/sys-apps/systemd/Manifest
index 67eb878e54d7..c5109b40a67f 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -9,7 +9,7 @@ DIST systemd-245.tar.gz 8993479 BLAKE2B be0b1fca5ba8585978f570868bc9135c1fee78ea
 DIST systemd-stable-244.3.tar.gz 8484735 BLAKE2B 25125ecdae59c852e8ceb45b7ed0b76631b301ab4026c4e389c4bc12090fe41f5918411a75bd20f38b6b3993445df93c850ba98f8d9b30fd24fc4e25f8355a3d SHA512 f8e83fa3e57ac8fdbed61b66bb45fd0eafa6fb36eda26f10690d93f34b03daab6ce4e7eff45b79dcaf59f11f41c1b022d1d9314f576c50ad28f6bb5901f1b18d
 DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d SHA512 47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172
 EBUILD systemd-244.3.ebuild 14561 BLAKE2B f7361cfed800988cd2d2ff70eadc3f75c15d7d1a3d12a9934574abd9c4b948207d69f25aa6326b3c90cc17274e80d70ba74c23361acc7a1b2749a25752f4db49 SHA512 4f08e146c380e8b14fa449ef11c8c33ddab8e358e7cb8efe7e39b6b2858828824405b70c223097a3dba3ceb06a2efc47cd957e2c0d5afdc2d620ad558f161c3c
-EBUILD systemd-245-r5.ebuild 15251 BLAKE2B 8eba167408d962a162117c4d666e0eb22bcff38ecf444e012452de9b98ee6971e552c9c908ceb151c5e979f99e4c9d5332d7107f9f4fc5d1f64dea0e66e29f0a SHA512 b20b15040dcd671ee7adbc629e800438c55b8c3ed4ade6d96ee3b72e4a46a98b10e26943e818f73ab9155613008b5bf654e8fbcd0c7f32db085e81926c9e4651
+EBUILD systemd-245-r5.ebuild 15231 BLAKE2B e9b5e4089aab548c6682605b2cda91c678ed45377196478f874aaea0f83ae3c23b9f390ad6775da1630ad15a7f35fab4341518e6e5c20f390b40349f9d1bf8df SHA512 5caad65472b77c17767f18512dbb6107d9c250b6beceabeaba24e3e42d6e5bdeaf325ef38d633b92cad52ef5ab743e2502d012adc6f450b2deddfa0fe70340f8
 EBUILD systemd-245.5.ebuild 15193 BLAKE2B 0a5548b066365acbcee84c9ba3396daff507ebd05865d0f179fb58037a3948132d2c719313854fc92dc457d22c4be796a3d17e1a1d8e6b7fb5fc3ac11589835d SHA512 a7d81528779a398196dc1ffe4795973df5f99cd5803349952ab0fb61b80bac1b4e7129070e98d663beffe0e3e6be292c8bfad12367de604f56b5623b8b7854ee
 EBUILD systemd-9999.ebuild 15087 BLAKE2B 58340aa7becaffe670c0fd0ba820733bed96feb5c0ed0de9374ba1410831331501095a7c860fcf6d73617649a8d2e63a66f998f52a2342924ff9b1c1aa637986 SHA512 3347cf91a050f86c2d6adbdf50813e22e2af3a0e5adf074da5f6990b3b0edd82a0220edd06f47b0556e90ce880a00ac9efbfa7061b0c8890a37a46fd401f6e9d
 MISC metadata.xml 2373 BLAKE2B fac7a9db4c217998f84bcbb5bc490eee748a35f9d991962d5aa21c6ec562d494af06b67fe35879ee2b245445d22ea7eadc4db6305215f393c4565b86665b3130 SHA512 e2d999684255f6c6509af7dca1b9e1411eac9a4cde6f30d9631c5b9d2bbe749a40f3d08c067d2cad5eb1cdd8ad823c3afb6844cc5e3c1d455fbd8cd20d87a696
diff --git a/sys-apps/systemd/systemd-245-r5.ebuild b/sys-apps/systemd/systemd-245-r5.ebuild
index 46c7844250b6..6e765fe563b5 100644
--- a/sys-apps/systemd/systemd-245-r5.ebuild
+++ b/sys-apps/systemd/systemd-245-r5.ebuild
@@ -131,7 +131,7 @@ BDEPEND="
 	>=dev-util/intltool-0.50
 	>=sys-apps/coreutils-8.16
 	sys-devel/m4
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	test? ( sys-apps/dbus )
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xml-dtd:4.5
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index 4a4283133193..46313102c45e 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -4,5 +4,5 @@ AUX tcp-wrappers-7.6-redhat-bug11881.patch 956 BLAKE2B ac2e8e4c8778899c6460bf6ae
 AUX tcp-wrappers-7.6.28-no-external-malloc.patch 317 BLAKE2B 4436d7bf54e13b038e8139c2dfd0a4a061b6113898560436ae0e5fb6e5a74c3c4c163c27f99e9957ec89665186beed30e7a57810db886b8a86148f6b58f5f594 SHA512 bdefe3dd35e96d1e140d1dc363f1904526aaf0c44952b8ec5e206c8e53693437f07be2ad136a0e22c38e09c1dcd1c73c755165cc68b4588715f6997f9c6affb8
 DIST tcp-wrappers_7.6.q-28.debian.tar.xz 36104 BLAKE2B 209fd9730785db8afc8ebec581f7132cfb4352f8807d2cea4715daf5c11aa08a92cf084ab1ff31222f5b265f032286ce2dcf49a238e9dc5616161c400fce4f08 SHA512 2c63201937737c19b4e5ca97dbc0ede9fc2d3b8fc344f8854a7d2afc0109ccb9ee52af94ba8a8498da910336a4f473825daa7a0cca26a0d93e1078e67abe16b0
 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
-EBUILD tcp-wrappers-7.6.28.ebuild 2421 BLAKE2B 85ebf9f0e8b3ef9a31631a2add177081e35cdbbccf56134e45b1947c1703db51aad96032a76700eb6310d72697491567570ecd858eb9dd6ccbb229b7f139d0df SHA512 3f8f400f4fb9ab91d9bfecf26c5e1bcedca5fc681c0f76b09f66f2d7f10ec1708dcbc7571e244ada5420a831d7ee35b793a154068ad439c2f39ab1bd39838256
+EBUILD tcp-wrappers-7.6.28.ebuild 2470 BLAKE2B ed4c4f993b0ec36c105c2871e480fe7e8d499283058e38e8c07ac3affce524fc73c4f0e76d691ce311b3210513ea609dc3f3e393b8f4aadb105b019baa297723 SHA512 4da0ea67fc429ba58061b4d2cb59b4db325fea902c794f1b73c4d27c4b63462001f4328c3e08e3ac3c8a9f97f95194a25f6ec823060c894fa25d8a81f668a6e0
 MISC metadata.xml 440 BLAKE2B 701c101283758170adf92309f323c549f8cdac83c8885cff01e0a9841474e88b00cd8ce7d3e5c0d19209cc2acd8c113d23129c54a116433cf495126960758bea SHA512 3075ada2500265fa53064720159a33779d79c46e4244a5cc6624d0c2de81dcacf62f89232162182bf29477c36025f4b3f4618d9ae3f592ebd714a658425428a5
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
index c6a037553529..e99386b4d958 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
@@ -60,6 +60,8 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
+	# https://bugs.gentoo.org/728348
+	unset STRINGS
 	temake all
 }
 
diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
index 4762c7250698..d61d193e2300 100644
--- a/sys-apps/toybox/Manifest
+++ b/sys-apps/toybox/Manifest
@@ -1,14 +1,8 @@
-DIST toybox-0.7.5.tar.gz 818815 BLAKE2B 0d91eb07b9c2e64c611be24eb09aac7ffc26d65f3dd39ee7663419e4eff1e9d559b7b6e8df0dc8e13986124aefa706b343c4a3521466f2bdf657d4c9a82a9fc2 SHA512 f0cc54da2394ed14b41dbc80bf674f86989f0312b645b9e1e5403fb0a3282cafce9608b2d738ab2dbb6fe3779eed70d51133a867c6ea76683dd7e6de245df127
-DIST toybox-0.7.6.tar.gz 834351 BLAKE2B 7c6737a8b16f77fd7a5e389be17ef8eb41d28718e46231ec1aa48af0a0ec1cbdc1c0b74670c3f79f58a5b0547f47aa6e5ccbaccc5451b12a80e1c566ee49a30d SHA512 1ed06114f5feb46e642bfeee517366a16c0a5d76562841a3cdf6b003bb330be10d4ac5009c7cf845eb5ea99bb8ae8b4291c413bbd45fd89c2ae3e4a69c1455bb
-DIST toybox-0.7.7.tar.gz 843039 BLAKE2B fb4ef2ad483acd2b42905e765f7287b41fa8b1822796579c4a57a8ad3f5a3cdb8bbcd0e6790eddc8daf2ec41c50be478c7d19623d1c8db2e7b1d4db8b52fbbc6 SHA512 89369662eaf48bb52909f49932b98395eed6e672f6a37387819a02ba9c33f6b737686782ca3bf0ed0f9b60e1e2fff88ad1ebb678999582986acfec371d100827
-DIST toybox-0.7.8.tar.gz 903344 BLAKE2B e223dabd7b44a050bb884d595235ea469524ffbcf3b29ee8a106354dff3250b5e9c7922cb8b499ff343e170735e29b321b9c00c370c67a1d20c8a5e44ab2bdd2 SHA512 125e4b22deda1e707a62c49b40bf7ac8a36122af27fd70ed45c651a61b5607765cf1c9b3b1c3103c0a5b5f4e7760a50e87ac62bfc89aa870a22ae8ad0aacad65
 DIST toybox-0.8.0.tar.gz 975002 BLAKE2B e137c3616d2affaf8b6f234cab49190b98540fe8f954244172f9ca80c749069f85ff8addd94e1018d3680f1a307df54671ee9b01726c5279f340f8fee3669609 SHA512 aeb15a02782cc0b3b46a892e2d82834e5172a7da04e2498eaefec58221305dd24a86aada5ce05978bd4694895ffeb94ae980fd767f4ee00c499b3dd518fd3e20
 DIST toybox-0.8.1.tar.gz 1015363 BLAKE2B a765a133910b7c8d903a1fa95338b8dee1267c3b7430267d47c4157d966256d16c615500acc38428296b9612649fafdaa111a149df7415ac580c01cfdd361025 SHA512 22f91046c75f986e44927ec89feab6c6afa1f614e5b0eae73e43f6ccd5c4328991ad283858fb1a5cb4d697806f38b8ab81782c160860a2c34ecbef3885636d5e
-EBUILD toybox-0.7.5.ebuild 1153 BLAKE2B 7045659da4001b0791fcaffffcdc2d3d362ffd5ca6b4f7b9faef6c4d7a6afd25a0649953017faa10ce10d5c8724da274518a1fe9e37718bf8f832bae308c6677 SHA512 5e70c6665773d9bbf334ffb8f0d90005e76b3e47c3eb8d1796738a619c5d5743a7eec476e1d4bbbe721b561916b7f15759c3ae2dd3f1e6952b9050b913ebdea5
-EBUILD toybox-0.7.6.ebuild 1153 BLAKE2B 401a475bac0b34e93117ec3b1b4494a95d50c4abf1d6271eda8d26d76b5738351ed9d5f35b10043b095e99418b054c6144ffc66dfdf839a4f6caa713c2bb0dce SHA512 be2886c58e3b75be69096f3858a72df21d1f6ca76ffda7e425242055a67e86d4ac1cab7f0622911e587695e4437a292a3460be7ac66632718d28b8a6f06763f7
-EBUILD toybox-0.7.7.ebuild 1153 BLAKE2B 401a475bac0b34e93117ec3b1b4494a95d50c4abf1d6271eda8d26d76b5738351ed9d5f35b10043b095e99418b054c6144ffc66dfdf839a4f6caa713c2bb0dce SHA512 be2886c58e3b75be69096f3858a72df21d1f6ca76ffda7e425242055a67e86d4ac1cab7f0622911e587695e4437a292a3460be7ac66632718d28b8a6f06763f7
-EBUILD toybox-0.7.8.ebuild 1150 BLAKE2B bedee69c61d30ec29870bd0ea4a081080fe4ccb96c1589f98fd5654bc6cb7d4aa5343b99db40f526dd89fbbdbef5c62a91bb357e01d0d697803c540b136e60fa SHA512 c31b51f1686425310997c1b14f6c78a793c5cd301a4f4e2a681dfb667be05437a99d43a737d4062c9888bf839db06bd32ce13426fa784d83825bbdb989670f95
+DIST toybox-0.8.3.tar.gz 1098057 BLAKE2B d962c4fd1c79229ace5a0836b6170e3ce8a5435df660b5306f5dd0aab32f4509b5c3cf5cc87eea597d336c7cdd51ca4895cadd420febeb9ef9270e85909f8dec SHA512 e2c5a22547cbd85bfee84c4aed3016895e4e0eba9b6f3dfc6cdfa0a0d59dfd74203a35389dcd0b2c557dd04eebbb051f9a458762af3abb32b473bd8924ed7b74
 EBUILD toybox-0.8.0.ebuild 1150 BLAKE2B 60afaa318851dcdf112b5e46a5963f539e095444f53f4ab9d9645a1ebac53b4cc78ff0eafa54b6dc413590c7e2ea21dbebbb8dd373c4d0d560b60d00e8869075 SHA512 0d0402203c6f292dbc1ea35fbde8a3bb37f3b5ea217c93d33a6865332be020bd4b1dbe376638a2531ef6b1bc65d9c83fcf57a35fb7518242d6b31c8ea82ec9ba
-EBUILD toybox-0.8.1.ebuild 1150 BLAKE2B 60afaa318851dcdf112b5e46a5963f539e095444f53f4ab9d9645a1ebac53b4cc78ff0eafa54b6dc413590c7e2ea21dbebbb8dd373c4d0d560b60d00e8869075 SHA512 0d0402203c6f292dbc1ea35fbde8a3bb37f3b5ea217c93d33a6865332be020bd4b1dbe376638a2531ef6b1bc65d9c83fcf57a35fb7518242d6b31c8ea82ec9ba
-EBUILD toybox-9999.ebuild 1150 BLAKE2B bedee69c61d30ec29870bd0ea4a081080fe4ccb96c1589f98fd5654bc6cb7d4aa5343b99db40f526dd89fbbdbef5c62a91bb357e01d0d697803c540b136e60fa SHA512 c31b51f1686425310997c1b14f6c78a793c5cd301a4f4e2a681dfb667be05437a99d43a737d4062c9888bf839db06bd32ce13426fa784d83825bbdb989670f95
+EBUILD toybox-0.8.1.ebuild 1152 BLAKE2B 5085537d8d99a88301e9a1d4cb835d88207fb584a23ca38abdb3c00c459ba37a669f83c98c838fafbcdc73695c7060abfc08bca49a0c56959a2c070a88d4a310 SHA512 b52bd51a23f1e413abbb8f4e07e4d116f024e7113f0fa78c53788896322d448820f80de74db5fbd267204c4d6e1ee0c3e96b07db568ccddf9b969a0851d36c18
+EBUILD toybox-0.8.3.ebuild 1152 BLAKE2B 69e582a35a852a026721e245e63e4cd48b3ceea36d2c3e412aac8bc31b3372b439668b3eb2343a8eac1eeaa5c526aa8f486ff4459cc68eee7c9edd5cb5abd338 SHA512 2f4f3619467b6b1fed69666d63dc43824fbab1e25e0fd2ffb179deb7d366852674a4ec84de5f40c7f2812d3afd0b5e78142de7baf6b3ae6bff0b08833b302df7
+EBUILD toybox-9999.ebuild 1152 BLAKE2B e8687d50b6363eb7f58e1c5dcc08fc2121dc7870e71b67d8b309316134a7f08b60469b3673109f78449e026191aa265f12b6a299482344ffea25e96f65216572 SHA512 0d3ab83fe880a38388b8d9e88e9688bf82247790792f3e22bf7f25aaf7c19552022e6f260cf1e4f5dc53a4d32a302805c3fcb9c11273620cbc49e405a8427936
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/sys-apps/toybox/toybox-0.7.5.ebuild b/sys-apps/toybox/toybox-0.7.5.ebuild
deleted file mode 100644
index 855407636080..000000000000
--- a/sys-apps/toybox/toybox-0.7.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multiprocessing savedconfig toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gfto/toybox.git"
-else
-	SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# makefile is stupid
-RESTRICT="test"
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="http://landley.net/code/toybox/"
-
-# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	epatch_user
-	restore_config .config
-}
-
-src_configure() {
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		einfo "Could not locate user configfile, so we will save a default one"
-		emake defconfig > /dev/null
-	fi
-}
-
-src_compile() {
-	tc-export CC STRIP
-	export HOSTCC=$(tc-getBUILD_CC)
-	unset CROSS_COMPILE
-	export CPUS=$(makeopts_jobs)
-	emake V=1
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	save_config .config
-	newbin generated/unstripped/toybox toybox
-}
diff --git a/sys-apps/toybox/toybox-0.7.6.ebuild b/sys-apps/toybox/toybox-0.7.6.ebuild
deleted file mode 100644
index 876ef47e3464..000000000000
--- a/sys-apps/toybox/toybox-0.7.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multiprocessing savedconfig toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gfto/toybox.git"
-else
-	SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# makefile is stupid
-RESTRICT="test"
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="http://landley.net/code/toybox/"
-
-# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	epatch_user
-	restore_config .config
-}
-
-src_configure() {
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		einfo "Could not locate user configfile, so we will save a default one"
-		emake defconfig > /dev/null
-	fi
-}
-
-src_compile() {
-	tc-export CC STRIP
-	export HOSTCC=$(tc-getBUILD_CC)
-	unset CROSS_COMPILE
-	export CPUS=$(makeopts_jobs)
-	emake V=1
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	save_config .config
-	newbin generated/unstripped/toybox toybox
-}
diff --git a/sys-apps/toybox/toybox-0.7.7.ebuild b/sys-apps/toybox/toybox-0.7.7.ebuild
deleted file mode 100644
index 876ef47e3464..000000000000
--- a/sys-apps/toybox/toybox-0.7.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multiprocessing savedconfig toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gfto/toybox.git"
-else
-	SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# makefile is stupid
-RESTRICT="test"
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="http://landley.net/code/toybox/"
-
-# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	epatch_user
-	restore_config .config
-}
-
-src_configure() {
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		einfo "Could not locate user configfile, so we will save a default one"
-		emake defconfig > /dev/null
-	fi
-}
-
-src_compile() {
-	tc-export CC STRIP
-	export HOSTCC=$(tc-getBUILD_CC)
-	unset CROSS_COMPILE
-	export CPUS=$(makeopts_jobs)
-	emake V=1
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	save_config .config
-	newbin generated/unstripped/toybox toybox
-}
diff --git a/sys-apps/toybox/toybox-0.8.1.ebuild b/sys-apps/toybox/toybox-0.8.1.ebuild
index 564d2c54b23c..d334e3570448 100644
--- a/sys-apps/toybox/toybox-0.8.1.ebuild
+++ b/sys-apps/toybox/toybox-0.8.1.ebuild
@@ -30,6 +30,8 @@ src_prepare() {
 }
 
 src_configure() {
+	tc-export CC STRIP
+	export HOSTCC="$(tc-getBUILD_CC)"
 	if [ -f .config ]; then
 		yes "" | emake -j1 oldconfig > /dev/null
 		return 0
@@ -40,8 +42,6 @@ src_configure() {
 }
 
 src_compile() {
-	tc-export CC STRIP
-	export HOSTCC=$(tc-getBUILD_CC)
 	unset CROSS_COMPILE
 	export CPUS=$(makeopts_jobs)
 	emake V=1
diff --git a/sys-apps/toybox/toybox-0.7.8.ebuild b/sys-apps/toybox/toybox-0.8.3.ebuild
index 722524f40455..616f3fbf49a8 100644
--- a/sys-apps/toybox/toybox-0.7.8.ebuild
+++ b/sys-apps/toybox/toybox-0.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -30,6 +30,8 @@ src_prepare() {
 }
 
 src_configure() {
+	tc-export CC STRIP
+	export HOSTCC="$(tc-getBUILD_CC)"
 	if [ -f .config ]; then
 		yes "" | emake -j1 oldconfig > /dev/null
 		return 0
@@ -40,8 +42,6 @@ src_configure() {
 }
 
 src_compile() {
-	tc-export CC STRIP
-	export HOSTCC=$(tc-getBUILD_CC)
 	unset CROSS_COMPILE
 	export CPUS=$(makeopts_jobs)
 	emake V=1
diff --git a/sys-apps/toybox/toybox-9999.ebuild b/sys-apps/toybox/toybox-9999.ebuild
index 722524f40455..68a184db8ebe 100644
--- a/sys-apps/toybox/toybox-9999.ebuild
+++ b/sys-apps/toybox/toybox-9999.ebuild
@@ -30,6 +30,8 @@ src_prepare() {
 }
 
 src_configure() {
+	tc-export CC STRIP
+	export HOSTCC="$(tc-getBUILD_CC)"
 	if [ -f .config ]; then
 		yes "" | emake -j1 oldconfig > /dev/null
 		return 0
@@ -40,8 +42,6 @@ src_configure() {
 }
 
 src_compile() {
-	tc-export CC STRIP
-	export HOSTCC=$(tc-getBUILD_CC)
 	unset CROSS_COMPILE
 	export CPUS=$(makeopts_jobs)
 	emake V=1
diff --git a/sys-apps/usbguard/Manifest b/sys-apps/usbguard/Manifest
index 8a1bb689d786..f7ec8610d6f5 100644
--- a/sys-apps/usbguard/Manifest
+++ b/sys-apps/usbguard/Manifest
@@ -1,5 +1,7 @@
 AUX usbguard-0.7.6-usbguard-dbus.openrc 278 BLAKE2B 58f11c693e25436605af6ad41a1f618e30b20f336cda6a11db480fdda65022c28ce84d6aa9e804c1344221f3aa4ab8a262094106bb677414c2b24e7971f9acad SHA512 f66bee161324610755371fa04199fcd81887c1a55ab73cc1922be719d61e8315b7a869e1d8af6c3df2d6922b07027dced3605e63b130e8f094fcb606aea20b9e
 AUX usbguard-0.7.6-usbguard.openrc 309 BLAKE2B d5297058d0ee8ce0f9fc91f2158f4aef5f077e1087800449a0319038d677a2a70274305058cd104ba30529b3c9daf82ffbe16ca5cdf20a3b4817e66d499d08c5 SHA512 512a08f59caf9de22b0776473a1ea9a4322b05c6286c99dac3055e0c6d52c78542448c33e19708338080cfdcdfcfb0f9868e8c523155e978c0161c262081da09
 DIST usbguard-0.7.6.tar.gz 1189194 BLAKE2B 4fefd9ccf13b094f64942559f481144f08986dc71154b87c1623459d2429c07e2738a17877d3f6c275e83ce904067b1284c588c9a95023c7205cc5e21ca118f0 SHA512 0b0d42276e48baac2dc1f9031eec25e3f622a8d6178cb0400b97c7d32005bfa158b60fd286fdc66206a8684658fefaf6389ef93511e942f025e75671d7455628
+DIST usbguard-0.7.8.tar.gz 1220764 BLAKE2B 8127acc0ef5dd89cc540097a71f10d56f3cb0a166453e27161e444d37dbf51cc4861bc9c71dcca16e9fec7187b3dcabb2bf08af522b2aaa4693fa4f4913a9ae0 SHA512 315c25ed7eb61cc0920047836dcca035cb07aecb6dfece9e4f6dc2ad61aaf6fdbf86898e43493958f3d12a146eb4c8f88b90bb246da0df83bb2097ce5b853e88
 EBUILD usbguard-0.7.6-r1.ebuild 1907 BLAKE2B 5cde16f4d987a58407ced3161b78840464b349d647cb32652cc6090e3d18946b711226610af2a69bb2facabf58708eac7fa2dc74976d9f0775c608c774906e3c SHA512 3678951cba045a47164edf3bf18ec977fd96a14ca89a14afca515d6c83a22f9ea3273286c463d80147befa52c60ecda53a52f94c8c03ab04a06b83f72147c6b1
+EBUILD usbguard-0.7.8.ebuild 1939 BLAKE2B 005089535c659c4bb5a66410b2bcfb6610a39cab2512563db6c72d9036bd4999b046b184d9cb5d120bc204e6e09d07e28266cc8c3f0ec6d9395f63fcaeb215f2 SHA512 56597f7718e59236cc7e19f9c37ac413092704551acdaa1ef9cb5d148cd73da4aac9f70d1b59c2f44c32379253d116da77c3a7cc0635f43bf5af8d5967c8203d
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/sys-apps/usbguard/usbguard-0.7.8.ebuild b/sys-apps/usbguard/usbguard-0.7.8.ebuild
new file mode 100644
index 000000000000..317ca17a882b
--- /dev/null
+++ b/sys-apps/usbguard/usbguard-0.7.8.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Daemon protecting your computer against BadUSB"
+HOMEPAGE="https://github.com/USBGuard/usbguard"
+SRC_URI="https://github.com/USBGuard/usbguard/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion dbus ldap policykit static-libs systemd"
+
+REQUIRED_USE="policykit? ( dbus )"
+
+CDEPEND="
+	dev-libs/pegtl
+	>=dev-libs/libsodium-0.4.5:=
+	>=dev-libs/protobuf-2.5.0:=
+	>=sys-cluster/libqb-0.16.0:=
+	sys-devel/gcc:*[cxx]
+	>=sys-libs/libcap-ng-0.7.0
+	>=sys-libs/libseccomp-2.0.0
+	>=sys-process/audit-2.7.7
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	dbus? (
+		dev-libs/glib:2
+		sys-apps/dbus
+		policykit? ( sys-auth/polkit[introspection] )
+	)
+	ldap? ( net-nds/openldap )
+	systemd? ( sys-apps/systemd )
+	"
+RDEPEND="${CDEPEND}
+	virtual/udev
+	"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	dev-cpp/catch:1
+	dbus? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		dev-util/gdbus-codegen
+	)
+	"
+
+src_configure() {
+	local myargs=(
+		$(use_with dbus)
+		$(use_with ldap)
+		$(use_with policykit polkit)
+		$(use_enable static-libs static)
+		$(use_enable systemd)
+	)
+
+	econf "${myargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/log/usbguard
+
+	newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard.openrc usbguard
+	use dbus && newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard-dbus.openrc usbguard-dbus
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn 'BEFORE STARTING USBGUARD please be sure to create/generate'
+	ewarn '                         a rules file at /etc/usbguard/rules.conf'
+	ewarn '                         so that you do not'
+	ewarn '                                            GET LOCKED OUT'
+	ewarn "                         of this system (\"$(hostname)\")."
+	ewarn
+	ewarn 'This command may be of help:'
+	ewarn '  sudo sh -c "usbguard generate-policy > /etc/usbguard/rules.conf"'
+	ewarn
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-21 17:50:24 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-21 17:50:24 +0100
commit	feb0daf81d888e9160f9f94502de09b66f2a63fd (patch)
tree	b6e5c40ce2abef3da27ed50a023153f475e0ddef /sys-apps
parent	9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff)