gentoo resync : 14.05.2020

26 files changed, 269 insertions, 332 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index d04177f7896f..502def9046c1 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/authenticator/Manifest b/sys-auth/authenticator/Manifest
index 8da45634f003..a85c81a72d04 100644
--- a/sys-auth/authenticator/Manifest
+++ b/sys-auth/authenticator/Manifest
@@ -3,4 +3,4 @@ AUX authenticator-0.2.4-support-use-of-gdlib-from-system.patch 638 BLAKE2B 76709
 DIST authenticator-0.2.4.tar.gz 142444 BLAKE2B 2df1462452d5aaead51af111359120c8a464058730129fd984dd568c709c58f6940a34b996d3b5435b78bd87b433a29735d3fd8e9629b512915720063b49b1a1 SHA512 16b942d24a1136350f78de92a287dcc6b52e9347cd0b73e8310b87c6c24b7075aebe909fe20d80532f7fa1b54d332b8b62fd2fc7d26ce15888fd47bb686520e2
 EBUILD authenticator-0.2.4-r1.ebuild 1723 BLAKE2B 27193130b4680db40cbb035691ecd2ee9a66909e58154e72c30481958d8918040a8c76e51ad2daf2d8ba6889425f01999764804f977d56ff5ba86ed23074893c SHA512 075833602036503592f5af544c14204b80998f0224f21a9056d62f9aab2b186fbd609efa8f7d56d00d055be8ff1acd84adeb8091925a102b9ff011daa680382b
 EBUILD authenticator-9999.ebuild 1604 BLAKE2B a78a1ae13e07f1e2801ed1e6f5c666977f44e7d652b8a9152a46e76bb8cb2cdd582943c7983a79ab371aef34228e33641c8967334ea2d44cfd979a1cae8b83bd SHA512 a522d6fcd9ed2ad9e3a6097395c32d0518f1eee5f664e15740fd1114a28f07e003d51406feee5c290c79aac266897cb86106bbcffcf57114e7490225118d04ff
-MISC metadata.xml 544 BLAKE2B fe9f1a1bba9cdf6c48644f526d9b2309773735143467192a007fe8e63e97480aff2bcbf04d442ab9bb61792386b6610a6fe874a52db5dd6dea9f51d0c174ee4b SHA512 112fb3e1bd3a559a4f6f29ae800365a77a5298aa572f089b7d52553851ba85603387c1b09d8a86ce039080520ed6fe473f953c345b6fe553d3ec415a3e6bbfb7
+MISC metadata.xml 331 BLAKE2B c5125e1da3269e8b132c7f22f7d2243d89dc5bf0bf3eb0bc6226835136257eeaa6e8bd999223a8c4181f4d4ace72dd8a308343ef0902cf9875dafc55086b05e1 SHA512 865e1173122514c621bfc8344c4277ed2cee57d4da93332cb63c7629b4eb79d4d97a4de2b53c30d1bd9092d8a396ded8ff174b0dd767b82a90c3a541f6ec9d97
diff --git a/sys-auth/authenticator/metadata.xml b/sys-auth/authenticator/metadata.xml
index e1df662ac76a..0b167f715997 100644
--- a/sys-auth/authenticator/metadata.xml
+++ b/sys-auth/authenticator/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>oleksandr.trotsenko@gmail.com</email>
-		<name>Oleksandr Trotsenko</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer>
 			<name>Bilal Elmoussaoui</name>
@@ -16,3 +9,4 @@
 		<bugs-to>https://gitlab.gnome.org/World/Authenticator/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
+
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 95ecf23c40e4..4aebb24a3bb8 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,6 +1,9 @@
 DIST keystone-16.0.0.tar.gz 1671648 BLAKE2B 172ce385a009c4c5fb83fa6fb7fa06d5be98e72064e21d4b5a62bb61bcbdfdce3702847820b71837ff54077b7b454fc0d2b95eabcbb2150f2919c7f9d3fc7299 SHA512 af4c977c4ef0fdcc89e94929c026daa1175caef96332f9dcb71a559659d8361467b2a40174847a8e7d7b70e1a151002cfe846a1be5fc7c5bfd1a8aeae3975397
+DIST keystone-16.0.1.tar.gz 1683325 BLAKE2B 6f22773592a1c843e82bcded230d2606b7fe8e540d50ccdbd85f53d4e5fda81023e85d04c258bc3741ecd7e4f8855299ab1828c8864862715ffd32629b877245 SHA512 060725244a181a98a3011ef7ae648b67054e64216fc62870b4190fd8475c8c36de01ae6428d1d4fac4bbdb405097aab1a9fe11daa65d4624dc613821cfeee004
 DIST keystone.conf.sample-16.0.0 104552 BLAKE2B 35ec8deb13239ba3d46c5ca78ea41372065a867e2715be3fb17cd43d65f1902f02d79d7bc6c6cb5c6aec19a3833d17e9dda12e8e0605919d3a28b6300d3f2cf3 SHA512 535c47e3ec39d454818c883599cf6fc304044208b71b822bdb67099728306235b2ad06ee60cfce9033375ae7b2338b03a0488267af65e900e80ed68e4fee8c5a
+DIST keystone.conf.sample-16.0.1 104552 BLAKE2B 35ec8deb13239ba3d46c5ca78ea41372065a867e2715be3fb17cd43d65f1902f02d79d7bc6c6cb5c6aec19a3833d17e9dda12e8e0605919d3a28b6300d3f2cf3 SHA512 535c47e3ec39d454818c883599cf6fc304044208b71b822bdb67099728306235b2ad06ee60cfce9033375ae7b2338b03a0488267af65e900e80ed68e4fee8c5a
 DIST keystone.conf.sample-2019.2.9999 104552 BLAKE2B 35ec8deb13239ba3d46c5ca78ea41372065a867e2715be3fb17cd43d65f1902f02d79d7bc6c6cb5c6aec19a3833d17e9dda12e8e0605919d3a28b6300d3f2cf3 SHA512 535c47e3ec39d454818c883599cf6fc304044208b71b822bdb67099728306235b2ad06ee60cfce9033375ae7b2338b03a0488267af65e900e80ed68e4fee8c5a
 EBUILD keystone-16.0.0.ebuild 5764 BLAKE2B ceb758ad21f80fdfc8f29f854a2837a9bdbdb4236cf46889363f89be419bd41fc5a3a3852837d52c7112f63ea830291239bef5e5d0a3444bfa92ac9d3be19b43 SHA512 f08c5fa1c5a655168bae30ca9169471515942691a84348c3ec51c77b41128625bcdab1ea7ed22659681f3c39dce5747f337226fd2066a238abae9ca449832131
+EBUILD keystone-16.0.1.ebuild 5698 BLAKE2B feb7ca10408e2eed5d3cb7a7e701dba64a959d49decc3c3eec540f1b5715a8d2a99017ce49d6c5dd68d20a0f0c808378959921788e71800bcfb10359224159e4 SHA512 994973fa68b25c3d5ffe15dbebdde685306b0cd52b2af0832fe24f0bda0aa6f3a0da0a95969be119934c1190cce4985daa7811fddd1a3a3a056efe04d592fa21
 EBUILD keystone-2019.2.9999.ebuild 5698 BLAKE2B feb7ca10408e2eed5d3cb7a7e701dba64a959d49decc3c3eec540f1b5715a8d2a99017ce49d6c5dd68d20a0f0c808378959921788e71800bcfb10359224159e4 SHA512 994973fa68b25c3d5ffe15dbebdde685306b0cd52b2af0832fe24f0bda0aa6f3a0da0a95969be119934c1190cce4985daa7811fddd1a3a3a056efe04d592fa21
 MISC metadata.xml 807 BLAKE2B 2e674e33b20a046cbe09e98474f3fc36dadac01f7438acbdc4bb8729b16cf8ca9bc8717b000b798d8d5501cdc14dd4365a5fa2f3e0326e160b74d7a0f8bcdbf7 SHA512 3738ac4fde08eb90daea5aeb9731cf6e303b3ad6838f07732e707d5597ee2d96ac6530f691b6ac8c0f347946b75695be98a19e224496d137bf1968bccfe156ad
diff --git a/sys-auth/keystone/keystone-16.0.1.ebuild b/sys-auth/keystone/keystone-16.0.1.ebuild
new file mode 100644
index 000000000000..f1cdd22c765a
--- /dev/null
+++ b/sys-auth/keystone/keystone-16.0.1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="The Openstack authentication, authorization, and service catalog"
+HOMEPAGE="https://launchpad.net/keystone"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/train/keystone.conf.sample -> keystone.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/keystone.git"
+	EGIT_BRANCH="stable/train"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/train/keystone.conf.sample -> keystone.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+sqlite ldap memcached mongo mysql postgres test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-restful-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/scrypt-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.44.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/pysaml2-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
+	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	memcached? (
+		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
+	)
+	mongo? (
+		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
+		!~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
+	)
+	ldap? (
+		>=dev-python/python-ldap-3.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ldappool-2.3.1[${PYTHON_USEDEP}]
+	)
+	|| (
+		www-servers/uwsgi[python,${PYTHON_USEDEP}]
+		www-apache/mod_wsgi[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+	acct-user/keystone
+	acct-group/keystone"
+
+python_prepare_all() {
+	# it's in git, but not in the tarball.....
+	sed -i '/^hacking/d' test-requirements.txt || die
+	mkdir -p ${PN}/tests/tmp/ || die
+	sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
+	sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
+	# allow useage of renamed msgpack
+	sed -i '/^msgpack/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -I 'test_keystoneclient*' \
+		-e test_static_translated_string_is_Message \
+		-e test_get_token_id_error_handling \
+		-e test_provider_token_expiration_validation \
+		-e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	diropts -m 0750
+	keepdir /etc/keystone /var/log/keystone
+	insinto /etc/keystone
+	insopts -m0640 -okeystone -gkeystone
+	newins "${DISTDIR}/keystone.conf.sample-${PV}" keystone.conf.sample
+	doins etc/logging.conf.sample
+	doins etc/default_catalog.templates
+#	doins etc/policy.v3cloudsample.json
+	insinto /etc/keystone/httpd
+	doins httpd/*
+
+	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
+	# stupid python doing stupid things
+	rm -r "${ED}"/usr/etc
+}
+
+pkg_postinst() {
+	elog "You might want to run:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "if this is a new install."
+	elog "If you have not already configured your openssl installation"
+	elog "please do it by modifying /etc/ssl/openssl.cnf"
+	elog "BEFORE issuing the configuration command."
+	elog "Otherwise default values will be used."
+}
+
+pkg_config() {
+	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
+		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
+		read
+		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
+	else
+		einfo "keystone PKI certificates directory already present, skipping configuration"
+	fi
+}
diff --git a/sys-auth/libyubikey/Manifest b/sys-auth/libyubikey/Manifest
index a8135a403c33..e9404915ab64 100644
--- a/sys-auth/libyubikey/Manifest
+++ b/sys-auth/libyubikey/Manifest
@@ -1,3 +1,3 @@
 DIST libyubikey-1.13.tar.gz 347337 BLAKE2B 99bbcc16115d913ffd548625f3366405879b0537c4dbcb9f6cebc406a057de642ae621d5793f1828056bfac266eb56b9a409cde44eb26753f955c9da6bcf8c0e SHA512 28f45cb9817c30a70d168ae507d3f8014051058d730eed92b31d92e96784138dea291bda4275511c5f92a6427cb4249d76c802b8abb867cec50e62fb770950f2
-EBUILD libyubikey-1.13.ebuild 470 BLAKE2B 22f084ae6efac02bfa5b8c23496ce4ce9ec9c197253d020620e3b710ae35bc6b93de70f0043ba0cd3e122d6b6f9f0d848d839f881f49ddb8b417ff1b08fdaa28 SHA512 64878f62d2f99d36ef7308b21027555b99b8c82b0792894f8cc0e055b800525b177509d946e2dd21c6cb49b6b09571e9fded5066c6f5638864ce2b3ce525ec3c
+EBUILD libyubikey-1.13.ebuild 474 BLAKE2B 51bfd0eb3808cecddfcc16d586dcd8f36502bf757440587a68c5562ecc50f43b5b72651362668e1335db2de2fa0ac1821a6b5d9d09841c8fb2f9e4224acb3506 SHA512 0b909c4cf68eb97e4090abca40441228c77277afd6b0c6c9e03e07c601fc053a6c16ab370f31f98076c573b93642877875b8239baa93d309dccde246c2bad840
 MISC metadata.xml 396 BLAKE2B 0df2e85cec1becd01c21fde4eabed2f3b02ede1db3d0576f141962aad6a00314cf846a2e77787eab642f9a680525f3cb679936b12ca86bb3be89124c7141b85d SHA512 87cbf3538d70332da7b2ffb4019b62aa4cd330cc6bda41141c4afcd352e3bf25880004364b0aafa790d2c66db9c1a80cd7f94e2207abe713c3adfadbd369b7e1
diff --git a/sys-auth/libyubikey/libyubikey-1.13.ebuild b/sys-auth/libyubikey/libyubikey-1.13.ebuild
index b46c2ea79093..39900d5ff3be 100644
--- a/sys-auth/libyubikey/libyubikey-1.13.ebuild
+++ b/sys-auth/libyubikey/libyubikey-1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://opensource.yubico.com/yubico-c/releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="static-libs"
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS )
diff --git a/sys-auth/oath-toolkit/Manifest b/sys-auth/oath-toolkit/Manifest
index 500e10af0254..751d5363e19d 100644
--- a/sys-auth/oath-toolkit/Manifest
+++ b/sys-auth/oath-toolkit/Manifest
@@ -3,5 +3,5 @@ AUX oath-toolkit-2.6.2-glibc228.patch 4786 BLAKE2B 7690a2b5249b7c668be5a516fa0a2
 DIST oath-toolkit-2.6.1.tar.gz 4238966 BLAKE2B 7af4f4997b18278aa1903470c79e5a7734e9e97e62a2de4685eee58ead59e3294cef0d6da0147746932a2891f59648b5473f02b5edd6c4fd81b4a9c80d9bde60 SHA512 59feadbc06d11a52bf5879493227c40358fc1f4f17ec3ff92e3a313e47b92f3154396fa3ff38ef163852b32c8bfcef1f59753b614d0138478b8f7e7971f55e62
 DIST oath-toolkit-2.6.2.tar.gz 4295786 BLAKE2B 2b97ab73339647b560b46373922095f18655a167b613b15d4ee2fd507d430025628d20eb111ff1d8025e78646b1d61d9680a7082caba1c75d247bb1d8b9b99dd SHA512 201a702a05a2e9fb3a66d04750e1a34e293342126caf02c344954a0d9fd0daafe73ca7f1fe273be129ae555a29b82b72fa2b4770ea2ad10711924e1926ec2cfb
 EBUILD oath-toolkit-2.6.1.ebuild 1481 BLAKE2B 1f65396837613df6f7c8c42fa22fd90dc248a94a83e4d9c068c13b9d3498d058906e0d00a207892c1fbaa12b99f6b00e6659a28fd881afcc3534427fd8020b08 SHA512 700f6a8191299e977d4dd8efcb758c3c8645bca76201d72ff299785f23cc236588b490623bc2b7a17d3537b2cd7d1a271f26f79d3bfde121ac9048e9a0aa0456
-EBUILD oath-toolkit-2.6.2.ebuild 1827 BLAKE2B 00eed71ebb402ef3847c3652467593014cf5143c827b9c8828b3681fd1e54e73f31c0f8b2fcf73612188ded406b8715667ef0ecc17639e029542e9e8d9546102 SHA512 8d1ce4848096c4d615b8cdf2b71da78cd6093b8be750d7e191f9d0b2cc92a6db550d95d63f5f2f5abe8afe2e0efb33b32908d7ffda0d4fd4ff7ca1ed86009f1c
+EBUILD oath-toolkit-2.6.2.ebuild 1830 BLAKE2B 4985bc9caa0bbc3626b477d745388815353d7458447c58bebb09ee5e007aea8dd21429af4bdaa7af2cf2aec3ce28f19c487a4fd338efa93d64e2d150fb5036c6 SHA512 179f133b2791f62c94e16042ec5037c6224a2a8c83badf622fab7771d7336998501fc98ea8e9e186ebc014a63e4dcc2a09f716c5b01f29f4db4dac14ea7cd27f
 MISC metadata.xml 560 BLAKE2B 946cac9a0134fb3291ad816283326746067411e000e98be05cd8f87dfa0455ef3558b1bdabcb537356fed867d8667850d929747592e7c79212c7ad3357434c84 SHA512 4d6506e02bb4a6f6069dfe357cc3e05c897699a067771baa995af823d4de587d2580b01bf1c2a38cb8f8f679ba0702498ad904b6bb1d685a2759c2b7752be7f2
diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild
index 00237b0bc4e0..691c859b4689 100644
--- a/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild
+++ b/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
 LICENSE="GPL-3 LGPL-2.1"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="pam pskc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-auth/pam_ldap/Manifest b/sys-auth/pam_ldap/Manifest
index e2cfa5d4b256..270be8fbaad0 100644
--- a/sys-auth/pam_ldap/Manifest
+++ b/sys-auth/pam_ldap/Manifest
@@ -1,3 +1,3 @@
 DIST pam_ldap-186.tar.gz 163437 BLAKE2B 4e917985b78349283c891daca94935792f2316afc08cd694edb7256c89a7ed612a62ba4b53111fc2022f6e11f754103bf58ac0a53a4298b011a5379625c51cdc SHA512 aaa6fbc48150db53bf92dcf600bcb8f0526baa2e6124f46468f59958c8a91495eb003d16a45b659c8cbb2d3481c4732a0d1f5945a2c98c09549ef8a51ed18a3d
-EBUILD pam_ldap-186-r1.ebuild 1144 BLAKE2B 31c6cd81fb0426bb730f2171ff9f8166cf5b62bace8df14e7d385edef9c178a52b5eb66a22bd934902d7a2441ee6b290d66d1b3f61c84a0d83660a3942c98443 SHA512 ad3d493c1dfac69491ba4390a29d4d2f423488fd0792681c7f2a6bf2ceece0c9910cd6752ed5e33f727dae898228dee99eac18caed5d9152eda5c23bdc690576
+EBUILD pam_ldap-186-r1.ebuild 1107 BLAKE2B 7b061ebe4818c13cbbdcd9c5ff459b0a422bb46e6150c9b85b0103cb72c95ee63c3337c4e5b0d2423f35026958c9df5b4a6e08b454f397c2fcdf69c7f2acfd3c SHA512 687f94e43ccab6c0daf45b09b139d98840044a36fc3809511a6a6b80c1066db795c27e0f6e7011ef04d2ed0c583e33eafcb188adb187316b8b8f87dc0bc7851e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild b/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild
index 62b0eba4718f..0cd43d581f46 100644
--- a/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild
+++ b/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="ssl sasl"
 
-DEPEND="|| ( >=sys-libs/glibc-2.1.3 >=sys-freebsd/freebsd-lib-9.1 )
+DEPEND=">=sys-libs/glibc-2.1.3
 	sys-libs/pam[${MULTILIB_USEDEP}]
 	>=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}]
 	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r3[${MULTILIB_USEDEP}] )"
diff --git a/sys-auth/pam_u2f/Manifest b/sys-auth/pam_u2f/Manifest
index 9341e250169a..e0d42fb88de0 100644
--- a/sys-auth/pam_u2f/Manifest
+++ b/sys-auth/pam_u2f/Manifest
@@ -1,10 +1,4 @@
 AUX pam_u2f-1.0.2-fix-Makefile.patch 324 BLAKE2B bc32459e011106e0f8516afe8e1afaa288e1bb53190b350467a12b9c6bbfaee9beb885bd78f1f1c3665b5f6907c1d7d99fb70d8d476b2dc3fe1fad2cba52f940 SHA512 eddf3c607e953b952ba91acb7d7bb1b8a43d6b70da86faece994011eb3eac43476c6ad9721be0a76805688dc9f9bab02ee5e13f58ce556bb68b8d574135ca44d
-DIST pam_u2f-1.0.4.tar.gz 349114 BLAKE2B 50811fe8b0076ff36af030e080593161a1f676f05d5eb970a50ea7092bac5bfe1832370d12b730be8422f7f42677ff950d5b3e932a6087a1698a4acba267c9d5 SHA512 324d1a1172eae567372f95971d9ee6bb237b47758b89c083f3cfb11275c4b0c22c4cf02a51380451f88d372dd6aaa415bdb671a43a7444062fbf8f50b658f087
-DIST pam_u2f-1.0.6.tar.gz 375181 BLAKE2B eac1457cbfd7951fd617ea0cff4220d6e5fe6f3e33cbc960024a28a1ca09f376fced27afa8e5a23dc5bab1881c226497c41fea7041dd891a36e1be7ba18c09f3 SHA512 e169d3d251a132213c04570099164aee0cdcea4bca233432f13af47b2cc5e420e14b3fb6dcde20cb8f77f9ed677459bd641aa3f9c1da65c88cd7490e26ab25e3
-DIST pam_u2f-1.0.7.tar.gz 378513 BLAKE2B a5b48e7ed36052a517941bc4af2c88a9d66e0a911620832a9c6256b294b1fe291860f2d481db32ab9fdf6a4deebb8dd0c31de97ac52ff2411d707679d7a997d1 SHA512 5b8fe116782684e5da395a4923b4c300b0d4b6d9e297c8de5cc4ca2ed633fda30cdbc4ae6bbb8a582faf8068dbed13048a2b2f742ebe9eea208fbb7a407caf0a
 DIST pam_u2f-1.0.8.tar.gz 384163 BLAKE2B 99767601027db25e6f8d2e59aad5f72b078cf7344ca10fa310a990d512c5e5a4c9ff7c24acb5b21b88b82aa47b4052b9164a422426d1f0889c8f6776526e5c80 SHA512 0bdbea6307428bbed2af69129af207304f7951418ad7df339563f47d678a2cfe6b80321552382e15771cfc06306fae746521850056376f533c430556d051ad36
-EBUILD pam_u2f-1.0.4-r1.ebuild 721 BLAKE2B 55b88c679c9e18108a15bc1e3f86f69f20251b48c97b6309eb314b1bae97b05675a0b495c8e33ef3d646ccb8f185dccb620487ce6e73697e03044c7e8ff53850 SHA512 b33db40f274aae1bcaa479321509a7e03f117e3244c5112a219d73d3da06655ce6031808e12f8fb7464b7aa59c0f75e84148c18baa18a954c15db995836ecd92
-EBUILD pam_u2f-1.0.6.ebuild 723 BLAKE2B 0efa92929d66e2a333ae1cd30cee021bb6b8b207a60e7c81d78c1da859927eaba6a75b7c400f685cb9165f0d589fcb427b2c5db4f1f049fc1421bbc4d34a78bd SHA512 4b26a6009f9f6c1355602959a2a66cb12a6680707cec2e63e18848171f56ffe1511f20f6c129ef7c4e6749e6ee3b4f8fb5fedbae7ced4370f502ee36923ece67
-EBUILD pam_u2f-1.0.7.ebuild 722 BLAKE2B d25dd2a57b4492021a67a026b1baaa912345bd811502a73a721b2bdba7915aa7a5ba30eea2eac631bf9f2d72440304e41d15d2e3e1ea31dd3abe9812c61f262b SHA512 09be3058fdcf89cb14831935c0bfa6ed81af653fadc752a3d04d51d4b0d3bce3b2d03ecbd5020f2b68ee930dcd648af5d56c0bf4c7d1de071798857519dd321f
 EBUILD pam_u2f-1.0.8.ebuild 721 BLAKE2B 1619ee4cc3cebf5dfc616df0503e17f98aaf86a3bcc03da8891d3b53f7dc1673d7dbec3f6e58bb0eb409397237a469c051f1d64aae26247e11152e7aee34d9f2 SHA512 d5a015b54ea6a697f0a676cd067d67e4ef7b0c738d974e679cb2289d153c03671d89c9ae5d2a22575bd3231278a1e349ca03024684614cf1e2cfa7ad9eaf8000
 MISC metadata.xml 714 BLAKE2B 8694b13d8ec22eb56c2bf5637f0ef83c5adf369025aeec8f4512a79914cc00e43620d6db1d95361199c7861a41afd2f1c215758e84584af7d6fdeb7d00619101 SHA512 a59a8b6a51c50c63495eecf712d3a5c9f60b0a94d78a6d2a12d789eb334d77bc80b00de3c2368cbc3cc684c359085af71153f09d0ce5f9cf4f74be77fdc09277
diff --git a/sys-auth/pam_u2f/pam_u2f-1.0.4-r1.ebuild b/sys-auth/pam_u2f/pam_u2f-1.0.4-r1.ebuild
deleted file mode 100644
index 19c2165cb440..000000000000
--- a/sys-auth/pam_u2f/pam_u2f-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic pam
-
-DESCRIPTION="Library for authenticating against PAM with a Yubikey"
-HOMEPAGE="https://github.com/Yubico/pam-u2f"
-SRC_URI="https://developers.yubico.com/${PN/_/-}/Releases/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="
-	app-crypt/libu2f-host
-	app-crypt/libu2f-server:=
-	sys-libs/pam"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-1.0.2-fix-Makefile.patch" )
-
-src_prepare() {
-	default
-	use debug || append-cppflags -UDEBUG_PAM -UPAM_DEBUG
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-pam-dir=$(getpam_mod_dir)
-}
diff --git a/sys-auth/pam_u2f/pam_u2f-1.0.6.ebuild b/sys-auth/pam_u2f/pam_u2f-1.0.6.ebuild
deleted file mode 100644
index f8e35d6f70d3..000000000000
--- a/sys-auth/pam_u2f/pam_u2f-1.0.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic pam
-
-DESCRIPTION="Library for authenticating against PAM with a Yubikey"
-HOMEPAGE="https://github.com/Yubico/pam-u2f"
-SRC_URI="https://developers.yubico.com/${PN/_/-}/Releases/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	app-crypt/libu2f-host
-	app-crypt/libu2f-server:=
-	sys-libs/pam"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-1.0.2-fix-Makefile.patch" )
-
-src_prepare() {
-	default
-	use debug || append-cppflags -UDEBUG_PAM -UPAM_DEBUG
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-pam-dir=$(getpam_mod_dir)
-}
diff --git a/sys-auth/pam_u2f/pam_u2f-1.0.7.ebuild b/sys-auth/pam_u2f/pam_u2f-1.0.7.ebuild
deleted file mode 100644
index 8ca02bff1a74..000000000000
--- a/sys-auth/pam_u2f/pam_u2f-1.0.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic pam
-
-DESCRIPTION="Library for authenticating against PAM with a Yubikey"
-HOMEPAGE="https://github.com/Yubico/pam-u2f"
-SRC_URI="https://developers.yubico.com/${PN/_/-}/Releases/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	app-crypt/libu2f-host
-	app-crypt/libu2f-server:=
-	sys-libs/pam"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-1.0.2-fix-Makefile.patch" )
-
-src_prepare() {
-	default
-	use debug || append-cppflags -UDEBUG_PAM -UPAM_DEBUG
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-pam-dir=$(getpam_mod_dir)
-}
diff --git a/sys-auth/rtkit/Manifest b/sys-auth/rtkit/Manifest
index ce1e9a5bab56..cdaf4fcb8150 100644
--- a/sys-auth/rtkit/Manifest
+++ b/sys-auth/rtkit/Manifest
@@ -1,15 +1,9 @@
-AUX rtkit-0.11-controlgroup.patch 528 BLAKE2B 2b8d61a1f6705c76015332ecf87a8d940cc96ac4c3e11104f90b037e0bfbb5e8f23468f48d22bef587079647abc18c70fcd3ae62abd825625dda8a82d4aa5d81 SHA512 772504a9bd911189655bf7ec494ca954c5316357afd2599b1873e0525025fad77589edc965ff7a2b84365cf702ea9173a24ebe9e03f06d73f371bbe480e2b22e
-AUX rtkit-0.11-gettime.patch 744 BLAKE2B a32bf8db977a473a005d0890b7b6064c0ef8769cdaf42a46bab5d43d5f62adec1f3896a5a6a110eaf3d146e2075304fbba692630c4ee3e1b58a07b1168776743 SHA512 b9207e1be512689e3896587105d135ab686d4eb1dd8c2e0feb62ca73eed2a8e1e473826e82b06bf240f26c64975b9793cd407cf6493a8f7eb6946da17198059c
-AUX rtkit-0.11-polkit.patch 2074 BLAKE2B 4530c423c62b1fae601a16271e8de829d9ee5e1b4f147867694de707ae24965ef4aa6864f3981ee0c4084e6652dcd418d651920887509eee2d3c8a4ae3d68d59 SHA512 cc4cb9879235398f828c16951e380e0456c9e5bbd5acc2a0968153c5ce361fd1aceeeeac8ab873c21c0556c5d4677cdad8ed9e23dd3b9b5a8a73cf9264ee5a4b
 AUX rtkit-0.12_introspection_no_asm.patch 15214 BLAKE2B 27dad779d711237e98f1659a566c5f95960b1d20cf729b8fe0c337180a1c9d8009c0301f932b95245eba6110fedf376cf4a401b87dd94b82fa836ebe380e7b5d SHA512 31d2019b74c2437fb952fff4864231b9ed6cdabb1aff2690350dcd2fcf407a4b856eed9ef582a4096a10e6dd57be05dc607f3ec4cb66c3323376e0ccb8222835
 AUX rtkit-0.12_libsystemd_optional.patch 1746 BLAKE2B 4aeb443e664179dc70766f9be8b94157655f3d621f3fbf2e3bd75fc842e244f2c0748ae7870b383e73d4add131c1f705ea37741f7db9ae9b82e3c2841601ebf5 SHA512 03c9817b32468307a4a4196895344b035c70d183e8d9d0109e75bb849c1920e602f1eb513d00985dc33dcee82af3b08f779b66a68697719f229df90daf9aa29d
 AUX rtkit-0.13_meson_rtkitctl_dir.patch 655 BLAKE2B 4f52913ac74851824410a83d00101c19e1e92d4dbd780d4a1382e4dfdf43a1417e25df8a5be9af7398e50136141f88e7ad95ffdc1602c1530bc557551c4806bc SHA512 bcc2bcaa85c2ad5ed8e1a0133f33e8e209c5ea7ce342866e95c70479c5bb2a7e1f97ad22a7b29cf62c1092a8be123e1e82e808e8c99786b55ba9b471fd9ed552
 AUX rtkit-0.13_meson_xxd_optional.patch 2002 BLAKE2B 6b6ba9a3a48e31e1f61c8fe97ef4feb58f87f4b4a3d53a14a05646eed1af714ccd49f133b0066a3037ffd02821521375dccb614b8db66cb8b889c56503b44615 SHA512 91be0179b07825f8aeb9ad407f809707fc3275dcd582ec05ad427ebf98ee7330aaf82c7c5f2e340856a0e0faa6c98c34665aba6546badfacaab7e099494a4efc
-DIST rtkit-0.11.tar.xz 126748 BLAKE2B e989f1fb9e33c2e06d7eedbe0aab45982d458b6a80aa8ba9b05ae94ed048ef1351d30f8800859a08d8bb0a53891e7b63f6bda6308b4521da10a61182ca3921f9 SHA512 4641af965dc64c0f498ae469fbee1ceb337204fa7d778fbbb41f2b5c5e88947e633c7e9ad037274fdd778c3c097a4a1dbb0b2add287d74eccbcd2d357cb2da22
 DIST rtkit-0.12.tar.xz 127504 BLAKE2B c2132098b98f24c1f1662df08c9940772cdad9a326c0c4b9180aac2e0878b0c71e5917ab2535628aab12ff29546faef1c68f455625c77bc2bac25864dddfa4b6 SHA512 cee48058367b5b8a705203865538d0ab4bda9d2f1d06d155360922cb095b5d6a5b0311fdda6c45d9f33227324394ca5fd3b5a399fc71e11ea4c609eab18a7b04
 DIST rtkit-0.13.tar.xz 130796 BLAKE2B 842d04556a47c199bed9fc6bc9281c0d88f83e183f01ef57ecbd80ce72949a301d6682a3aab96e996e71b82d8e8c7a85e1d44524f2ed6fbdffc6bf236cdcadaa SHA512 c058d770a4ccfdf4e2e3a713748b6a705b6d3e148a903b9dbba4bba9d3ded2b819d7dfbfa37b9fad78e57c0a5f10f2f94226f8738f666e692a085ab297a36b36
-EBUILD rtkit-0.11-r2.ebuild 1339 BLAKE2B 75bfeaa24a90088e7d4dd57d33112a829d9730b129bdd3c0d1c0b81d8bcf3fdb17a8bf3a8709125fac720b417cb12dba09e47be8b171025a091c90efbe2584da SHA512 6a49dfeef7077c85f69d3953edfb558b76d95cc5ba4fdb9dd6d3df0026ba2ec20323dfbdb2e720496942192ab0e013f210891b998687679555ff298d6a0fab1f
-EBUILD rtkit-0.11-r3.ebuild 1308 BLAKE2B 206029f511c0527b397aff930fd2a8894166ff882a1d0500c5a3f687c4d40679a8eee12ce0d75c2524227ca6d663bd4f3ce01a83f27aaa20b9d911f5e1d44201 SHA512 e3e10f7762b6d24076a8b9307e76abb59987d7a70cf3b946c31199eb84c64e20043494d7586b2659cc2d6898d1af2abf48da31ee8cc583f580cc6d43c97a71b8
-EBUILD rtkit-0.12-r1.ebuild 1180 BLAKE2B 0d8fa158da9c8439e0bbad2a376d4383c63a02f37d589bb41f727b16b7fd477788797d66a87e04ccba4314cb58b38da2310a2c785fa0a793fd804da70194f1f2 SHA512 298597e234dc9fcc770b5812a7a88a7c4033c60791784559df329a2aca28a3a0c7c2f36342d18c34a7e62d83c3dabdb440bc4acd67d642ebafd6da521578ef5e
-EBUILD rtkit-0.13-r1.ebuild 1187 BLAKE2B bb92011e795010ca6608853e3b814f03cdbaf5ff3699b6d56f9d794c5756972c8f8402b2186a799f098323b43805d76a37d57b865ab8f2336aa6c40972748d3c SHA512 efde1304bfa4865454932e64faa0d1e510edc9f408fd7b7bc4b545706d9182285399e42e9423e90638b402f7df95ae6740efd98d2efe89756d0b20a830d11920
+EBUILD rtkit-0.12-r1.ebuild 1165 BLAKE2B 8c0ddde1f2c211a31ccc0aade28c8d72b895d78bb999d38e862f0ed99e717767a462972fe9aa748dcb99a3331081e295e3a3e490391741a634d35712b94fab7d SHA512 438f4bf77aecaefc977634f58360a2c334739bacd9b005caa86f039411e530fe97fe06c6347e3febbca3ff69dcadd163eedb1c78c5049019b9607a24065efaa8
+EBUILD rtkit-0.13-r1.ebuild 1179 BLAKE2B c2cc1d449af644760e3cceffeb271bd1cc5241434de67c521a8fc81916a2af8ae11ec660a639b420ee7bd1eb84f8d4ce22f45c344bb3ccd069bcabe9f3896277 SHA512 dfbc2cd978ed8797f42736ca544548ddcc690c8009c2634ba123cba1289e2177ce701e054d6f63dcbefb1ee90e35d7554808dce1bd9e0944ee05798b0a0fb518
 MISC metadata.xml 455 BLAKE2B cc63fbcf541ef442091a8bd3f8b2da07f629b71778b0ece05a18617088de554f6f8ffdc1d4aeed4a73bb957c88b470fcec52781704800575b364a3d2164b3914 SHA512 90bde656e242fe6cd7b408671f419ee54f73a781b67ee9047c8cd06d7fb29fee2882aed7ab95b42f22fdb65570f389e04931f8fa24506307b1bc8387c213850e
diff --git a/sys-auth/rtkit/files/rtkit-0.11-controlgroup.patch b/sys-auth/rtkit/files/rtkit-0.11-controlgroup.patch
deleted file mode 100644
index 7a36deeeae7b..000000000000
--- a/sys-auth/rtkit/files/rtkit-0.11-controlgroup.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git rtkit-0.11/rtkit-daemon.service.in~ rtkit-0.11/rtkit-daemon.service.in
-index 3dfefa6..d0dc786 100644
---- rtkit-0.11/rtkit-daemon.service.in~
-+++ rtkit-0.11/rtkit-daemon.service.in
-@@ -27,9 +27,5 @@ CapabilityBoundingSet=CAP_SYS_NICE CAP_DAC_READ_SEARCH CAP_SYS_PTRACE CAP_SYS_CH
- PrivateTmp=yes
- PrivateNetwork=yes
- 
--# Work around the fact that the Linux currently doesn't assign any RT
--# budget to CPU control groups that have none configured explicitly
--ControlGroup=cpu:/
--
- [Install]
- WantedBy=graphical.target
diff --git a/sys-auth/rtkit/files/rtkit-0.11-gettime.patch b/sys-auth/rtkit/files/rtkit-0.11-gettime.patch
deleted file mode 100644
index 43732081386e..000000000000
--- a/sys-auth/rtkit/files/rtkit-0.11-gettime.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Lennart Poettering <lennart@poettering.net>
-Date: Thu, 26 Sep 2013 19:52:58 +0000 (+0200)
-Subject: build-sys: since clock_gettime() moved to libc use mq_open to check for librt
-X-Git-Url: http://git.0pointer.de/?p=rtkit.git;a=commitdiff_plain;h=d550837387e4185ebcde1023702580e35eb441e7
-
-build-sys: since clock_gettime() moved to libc use mq_open to check for librt
----
-
-diff --git a/configure.ac b/configure.ac
-index 5a77363..62c17f5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -111,7 +111,7 @@ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- CC="$PTHREAD_CC"
- 
- AC_SEARCH_LIBS([sched_setscheduler], [rt])
--AC_SEARCH_LIBS([clock_gettime], [rt])
-+AC_SEARCH_LIBS([mq_open], [rt])
- AC_SEARCH_LIBS([cap_init], [cap])
- 
- PKG_CHECK_MODULES(DBUS, dbus-1)
diff --git a/sys-auth/rtkit/files/rtkit-0.11-polkit.patch b/sys-auth/rtkit/files/rtkit-0.11-polkit.patch
deleted file mode 100644
index ad489c466184..000000000000
--- a/sys-auth/rtkit/files/rtkit-0.11-polkit.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-X-Git-Url: http://git.0pointer.de/?p=rtkit.git;a=blobdiff_plain;f=rtkit-daemon.c;h=3ecc1f7840a0d9bdd3af7f08933c4a62546094eb;hp=2ebe673309315f16bc2bc2e0c51a556fb215bc51;hb=88d4082ef6caf6b071d749dca1c50e7edde914cc;hpb=e86e04865ebc1a92c8fa3007843ebcf9c8fa4c05
-
-diff --git a/rtkit-daemon.c b/rtkit-daemon.c
-index 2ebe673..3ecc1f7 100644
---- a/rtkit-daemon.c
-+++ b/rtkit-daemon.c
-@@ -1170,12 +1170,14 @@ static int verify_polkit(DBusConnection *c, struct rtkit_user *u, struct process
-         DBusMessage *m = NULL, *r = NULL;
-         const char *unix_process = "unix-process";
-         const char *pid = "pid";
-+        const char *uid = "uid";
-         const char *start_time = "start-time";
-         const char *cancel_id = "";
-         uint32_t flags = 0;
-         uint32_t pid_u32 = p->pid;
--        uint64_t start_time_u64 = p->starttime;
-+        uint32_t uid_u32 = (uint32_t)u->uid;
-         DBusMessageIter iter_msg, iter_struct, iter_array, iter_dict, iter_variant;
-+        uint64_t start_time_u64 = p->starttime;
-         int ret;
-         dbus_bool_t authorized = FALSE;
- 
-@@ -1206,6 +1208,13 @@ static int verify_polkit(DBusConnection *c, struct rtkit_user *u, struct process
-         assert_se(dbus_message_iter_close_container(&iter_dict, &iter_variant));
-         assert_se(dbus_message_iter_close_container(&iter_array, &iter_dict));
- 
-+        assert_se(dbus_message_iter_open_container(&iter_array, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict));
-+        assert_se(dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &uid));
-+        assert_se(dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "u", &iter_variant));
-+        assert_se(dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_UINT32, &uid_u32));
-+        assert_se(dbus_message_iter_close_container(&iter_dict, &iter_variant));
-+        assert_se(dbus_message_iter_close_container(&iter_array, &iter_dict));
-+
-         assert_se(dbus_message_iter_close_container(&iter_struct, &iter_array));
-         assert_se(dbus_message_iter_close_container(&iter_msg, &iter_struct));
- 
diff --git a/sys-auth/rtkit/rtkit-0.11-r2.ebuild b/sys-auth/rtkit/rtkit-0.11-r2.ebuild
deleted file mode 100644
index f39c932527cb..000000000000
--- a/sys-auth/rtkit/rtkit-0.11-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils systemd user autotools linux-info
-
-DESCRIPTION="Realtime Policy and Watchdog Daemon"
-HOMEPAGE="https://0pointer.de/blog/projects/rtkit"
-SRC_URI="https://0pointer.de/public/${P}.tar.xz"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="
-	sys-apps/dbus
-	sys-auth/polkit
-	sys-libs/libcap
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	# Fedora patches
-	"${FILESDIR}/${P}-polkit.patch"
-	"${FILESDIR}/${P}-gettime.patch"
-	"${FILESDIR}/${P}-controlgroup.patch"
-)
-
-pkg_pretend() {
-	if use kernel_linux; then
-		CONFIG_CHECK="~!RT_GROUP_SCHED"
-		ERROR_RT_GROUP_SCHED="CONFIG_RT_GROUP_SCHED is enabled. rtkit-daemon (or any other "
-		ERROR_RT_GROUP_SCHED+="real-time task) will not work unless run as root. Please consider "
-		ERROR_RT_GROUP_SCHED+="unsetting this option."
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	enewgroup rtkit
-	enewuser rtkit -1 -1 -1 "rtkit"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-
-	./rtkit-daemon --introspect > org.freedesktop.RealtimeKit1.xml
-	insinto /usr/share/dbus-1/interfaces
-	doins org.freedesktop.RealtimeKit1.xml
-}
diff --git a/sys-auth/rtkit/rtkit-0.11-r3.ebuild b/sys-auth/rtkit/rtkit-0.11-r3.ebuild
deleted file mode 100644
index 67b2970cb4ed..000000000000
--- a/sys-auth/rtkit/rtkit-0.11-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils systemd autotools linux-info
-
-DESCRIPTION="Realtime Policy and Watchdog Daemon"
-HOMEPAGE="https://0pointer.de/blog/projects/rtkit"
-SRC_URI="https://0pointer.de/public/${P}.tar.xz"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="acct-group/rtkit
-	acct-user/rtkit
-	sys-apps/dbus
-	sys-auth/polkit
-	sys-libs/libcap
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	# Fedora patches
-	"${FILESDIR}/${P}-polkit.patch"
-	"${FILESDIR}/${P}-gettime.patch"
-	"${FILESDIR}/${P}-controlgroup.patch"
-)
-
-pkg_pretend() {
-	if use kernel_linux; then
-		CONFIG_CHECK="~!RT_GROUP_SCHED"
-		ERROR_RT_GROUP_SCHED="CONFIG_RT_GROUP_SCHED is enabled. rtkit-daemon (or any other "
-		ERROR_RT_GROUP_SCHED+="real-time task) will not work unless run as root. Please consider "
-		ERROR_RT_GROUP_SCHED+="unsetting this option."
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-
-	./rtkit-daemon --introspect > org.freedesktop.RealtimeKit1.xml
-	insinto /usr/share/dbus-1/interfaces
-	doins org.freedesktop.RealtimeKit1.xml
-}
diff --git a/sys-auth/rtkit/rtkit-0.12-r1.ebuild b/sys-auth/rtkit/rtkit-0.12-r1.ebuild
index 3a2200bc2135..f882e95fc82f 100644
--- a/sys-auth/rtkit/rtkit-0.12-r1.ebuild
+++ b/sys-auth/rtkit/rtkit-0.12-r1.ebuild
@@ -6,12 +6,12 @@ EAPI=7
 inherit autotools linux-info
 
 DESCRIPTION="Realtime Policy and Watchdog Daemon"
-HOMEPAGE="https://0pointer.de/blog/projects/rtkit"
+HOMEPAGE="https://github.com/heftig/rtkit"
 SRC_URI="https://github.com/heftig/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-3 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="systemd"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sys-auth/rtkit/rtkit-0.13-r1.ebuild b/sys-auth/rtkit/rtkit-0.13-r1.ebuild
index 61c97841c750..feb00a847531 100644
--- a/sys-auth/rtkit/rtkit-0.13-r1.ebuild
+++ b/sys-auth/rtkit/rtkit-0.13-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit linux-info meson
 
 DESCRIPTION="Realtime Policy and Watchdog Daemon"
-HOMEPAGE="https://0pointer.de/blog/projects/rtkit"
+HOMEPAGE="https://github.com/heftig/rtkit"
 SRC_URI="https://github.com/heftig/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-3 BSD"
diff --git a/sys-auth/ykpers/Manifest b/sys-auth/ykpers/Manifest
index 804aeb0be762..c7510d52b496 100644
--- a/sys-auth/ykpers/Manifest
+++ b/sys-auth/ykpers/Manifest
@@ -1,6 +1,7 @@
 AUX ykpers-1.20.0-fix-gcc10-fno-common.patch 308 BLAKE2B 720da4ac3f20c4512987b47068d7589ac70db0450306ddd16aec8ce5dde2e36e0d58c6ca0e7ffa5765b9b7a85b53a120078a117782ac6e8bf76066db52dd78ca SHA512 762bea78a6c6c2e43221374c6baf20828741e01532fd2bdc420ab197e96bcbc0eb6a1b157971ac58da7e1a7d8b4717cd1a1be84af23b473f51adfe4af57d1f4b
+AUX ykpers-1.20.0-json-boolean.patch 3572 BLAKE2B 684b9dab508b8d100d4e9237d833cb9160c33314a4076476b9342858844627acccc8f7025da0f22524251ca4541feceededd0f663e03810e53935ea809d1e556 SHA512 a8bc7ae71d0a05476688abfaea070ca7dc2eaa68e033524d4a1b2b6240eec2932d867e9eeaa248874a04f254618cd79bf9ebaa17421938b0c2e62502bf90c055
 DIST ykpers-1.19.3.tar.gz 127789 BLAKE2B 8dfc2751be92e69fcf98f5dc75d87eb170a4f70ff13faa321a85d4a04e27818823acbf02284ba23cb78ea758111513457ced4cdaa6961621a91f68b059eff378 SHA512 436c9807e488f7b324b892da7bfc7ea93e2b746cc3ae075822e9e8bfe478ef8e61c194127e5d4f50f6c1d9512292640d033464cceb6b8a18069411ff7993cc52
 DIST ykpers-1.20.0.tar.gz 127975 BLAKE2B 8753332be4df3eeb6ef0489782037fca12883a263d5697cfaee901763e4698ca5415953da1c2f8b3512de041c1e78735c03a5e6ea2101c71ada36d4e6d5d3d2d SHA512 a38b26700793f0a801e5f5889bbbce4a3f728d22aaecf8d0890f1b5135e67bed16a78b7a36dbc323c5d296901f6dd420fa658a982492a0cd9f0bbf95a5fbc823
 EBUILD ykpers-1.19.3-r1.ebuild 1077 BLAKE2B c80749b2db997e79112cec9dee3b6ad3e838ed30febc099d79180f1e2a9057edd200b705a1421b2f6e378be8a514c0a3e04cb809f2f795e00a88a95447d9fdce SHA512 b114d2b8f472da3dfebb2f5b5de9ca69a73dbe32abe9b5f62fd694a5d5755f80493d30d741d2ddcaa06d9235263c6fcc5abff54c94b3fd407a5d9f71ca1fa78f
-EBUILD ykpers-1.20.0.ebuild 1145 BLAKE2B fa40a4482e52df4e3015ae190384816ef245d5be31bb498d9a951f6da59d622f971923b0b8ac78f83acc80aeec20a3ff8d3c57a45ffc76f5118e67749f7a8988 SHA512 abf9bd75bc9e4f13beae03f76e40368805429c419414c390459946a67e265cdf91f1d15daa269d838a8bfadf6c7b7f65f77224b766913e80322f16284c1efb40
+EBUILD ykpers-1.20.0.ebuild 1200 BLAKE2B 50c20c80f3b0b084c4d16b3c1f18cfd91395efad2ecb272370355157bb9a7652aaa6b676b5bcc7d8bec75ec0dadc4b539e872813623088348dab43e2fad981e4 SHA512 4537781961c25d9c2e7955a787d8c3f3f51cd34d93e8bafff568adc706590c67c6b746d8a3693e34be5262f4a2bb611be15b6053a5bca94a55277759f695a9d1
 MISC metadata.xml 632 BLAKE2B b03dff691e31f6d0ff188f1e10156140f0b9d5a91993be3be01f291e5edb75a0e8776a550ad3a66ac0244c402bbb40aa9e7948307d498d05d5c8d6b9b1997c4a SHA512 1cb1ba38e29077530438a94c0a2c4e6724abc4b8e3f946466d141497495b6f316094c5f6d2313e260b163c979f65a777570de03a7630c2908a085ce5da34580b
diff --git a/sys-auth/ykpers/files/ykpers-1.20.0-json-boolean.patch b/sys-auth/ykpers/files/ykpers-1.20.0-json-boolean.patch
new file mode 100644
index 000000000000..ca5a918d21f1
--- /dev/null
+++ b/sys-auth/ykpers/files/ykpers-1.20.0-json-boolean.patch
@@ -0,0 +1,83 @@
+From 0aa2e2cae2e1777863993a10c809bb50f4cde7f8 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Sat, 25 Apr 2020 20:55:28 +0200
+Subject: [PATCH] fix boolean value with json-c 0.14
+
+Upstream removed the TRUE and FALSE defines in commit
+0992aac61f8b087efd7094e9ac2b84fa9c040fcd.
+---
+ ykpers-json.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/ykpers-json.c b/ykpers-json.c
+index a62e907..15ad380 100644
+--- a/ykpers-json.c
++++ b/ykpers-json.c
+@@ -40,7 +40,7 @@
+ #define yk_json_object_object_get(obj, key, value) json_object_object_get_ex(obj, key, &value)
+ #else
+ typedef int json_bool;
+-#define yk_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? (json_bool)FALSE : (json_bool)TRUE
++#define yk_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? 0 : 1
+ #endif
+ 
+ static void set_json_value(struct map_st *p, int mode, json_object *options, YKP_CONFIG *cfg) {
+@@ -50,7 +50,7 @@ static void set_json_value(struct map_st *p, int mode, json_object *options, YKP
+ 	if(p->mode && (mode & p->mode) == mode) {
+ 		json_object *joption;
+ 		json_bool ret = yk_json_object_object_get(options, p->json_text, joption);
+-		if(ret == TRUE && json_object_get_type(joption) == json_type_boolean) {
++		if(ret == 1 && json_object_get_type(joption) == json_type_boolean) {
+ 			int value = json_object_get_boolean(joption);
+ 			if(value == 1) {
+ 				p->setter(cfg, true);
+@@ -230,20 +230,20 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) {
+ 			ykp_errno = YKP_EINVAL;
+ 			goto out;
+ 		}
+-		if(yk_json_object_object_get(jobj, "yubiProdConfig", yprod_json) == FALSE) {
++		if(yk_json_object_object_get(jobj, "yubiProdConfig", yprod_json) == 0) {
+ 			ykp_errno = YKP_EINVAL;
+ 			goto out;
+ 		}
+-		if(yk_json_object_object_get(yprod_json, "mode", jmode) == FALSE) {
++		if(yk_json_object_object_get(yprod_json, "mode", jmode) == 0) {
+ 			ykp_errno = YKP_EINVAL;
+ 			goto out;
+ 		}
+-		if(yk_json_object_object_get(yprod_json, "options", options) == FALSE) {
++		if(yk_json_object_object_get(yprod_json, "options", options) == 0) {
+ 			ykp_errno = YKP_EINVAL;
+ 			goto out;
+ 		}
+ 
+-		if(yk_json_object_object_get(yprod_json, "targetConfig", jtarget) == TRUE) {
++		if(yk_json_object_object_get(yprod_json, "targetConfig", jtarget) == 1) {
+ 			int target_config = json_object_get_int(jtarget);
+ 			int command;
+ 			if(target_config == 1) {
+@@ -275,13 +275,13 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) {
+ 		if(mode == MODE_OATH_HOTP) {
+ 			json_object *jdigits, *jrandom;
+ 			ykp_set_tktflag_OATH_HOTP(cfg, true);
+-			if(yk_json_object_object_get(options, "oathDigits", jdigits) == TRUE) {
++			if(yk_json_object_object_get(options, "oathDigits", jdigits) == 1) {
+ 				int digits = json_object_get_int(jdigits);
+ 				if(digits == 8) {
+ 					ykp_set_cfgflag_OATH_HOTP8(cfg, true);
+ 				}
+ 			}
+-			if(yk_json_object_object_get(options, "randomSeed", jrandom) == TRUE) {
++			if(yk_json_object_object_get(options, "randomSeed", jrandom) == 1) {
+ 				int random = json_object_get_boolean(jrandom);
+ 				int seed = 0;
+ 				if(random == 1) {
+@@ -290,7 +290,7 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) {
+ 					goto out;
+ 				} else {
+ 					json_object *jseed;
+-					if(yk_json_object_object_get(options, "fixedSeedvalue", jseed) == TRUE) {
++					if(yk_json_object_object_get(options, "fixedSeedvalue", jseed) == 1) {
+ 						seed = json_object_get_int(jseed);
+ 					}
+ 				}
diff --git a/sys-auth/ykpers/ykpers-1.20.0.ebuild b/sys-auth/ykpers/ykpers-1.20.0.ebuild
index 37d5abec3c52..6dda194e9803 100644
--- a/sys-auth/ykpers/ykpers-1.20.0.ebuild
+++ b/sys-auth/ykpers/ykpers-1.20.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Library and tool for personalization of Yubico's YubiKey"
 SRC_URI="https://github.com/Yubico/yubikey-personalization/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 HOMEPAGE="https://github.com/Yubico/yubikey-personalization"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 SLOT="0"
 LICENSE="BSD-2"
 IUSE="consolekit static-libs"
@@ -26,7 +26,10 @@ RDEPEND="${DEPEND}
 "
 
 S="${WORKDIR}/yubikey-personalization-${PV}"
-PATCHES=( "${FILESDIR}"/${PN}-1.20.0-fix-gcc10-fno-common.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.20.0-fix-gcc10-fno-common.patch
+	"${FILESDIR}"/${PN}-1.20.0-json-boolean.patch
+)
 
 DOCS=( doc/. AUTHORS NEWS README )