gentoo resync : 27.03.2021

21 files changed, 260 insertions, 597 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index b62f5d19b62a..c7fc7a760a19 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index cc1de4b9e6ee..28472271515f 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -3,7 +3,8 @@ AUX fprintd-1.90.7_0001-add-test-feature-and-make-tests-optional.patch 2426 BLAK
 AUX fprintd-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch 1144 BLAKE2B f417baf7a6d686a753381501ef2e6df6bc867c4a938d47b70def205b92a3ea20adb2ab55a1ff26d921ef433d846c150bb24d9a4102a39e61c2e424b53effe66e SHA512 4a234200e9a03ba3acb710857a64d35d84a4b954d9289a8fc400355dd27cc8cdf5da6d2dc11e60add57aae04e93e4c890b8a75e4984516fad14f9236acf0f699
 DIST fprintd-0.8.1.tar.bz2 75254 BLAKE2B bf59c47c3d0186677bfd180e472e13773afebd4c3438e0e8e8cce34156df1c64c142b73d541fa876b96d4881e6967745a8c29be310dd33a509cb1863c836634e SHA512 438098fb677b742fdb279f3df85a1f2c800fce7498130c09b7408f21656ff256323b3bce4c22a2499e52c2ca7cddbc7f26033be7869939d23f9b5c436aa1f252
 DIST fprintd-v1.90.8.tar.bz2 635139 BLAKE2B 4f9e5c395c32dd5de3f5ed4d17e81c28a55de0f411deb3ccbc5d1330129be2bc8263c63c61a5e4910f74e49ebbbf508e858f5ee131eb4552e2ea8ab167bc6021 SHA512 0f38e0ce9f7c1459ba5359d0834569fe5d3f5ec3c9499d008dc39b9c869bbfa1cb293b1d96d22f9f36708f26984a1b3f0776685d628df69f1ed6db14de04a489
-EBUILD fprintd-0.8.1-r2.ebuild 1467 BLAKE2B 09c611813121532bb15a25e849d64d4e7eca38e8c2dcd5909877532b104151c0ce8301ff902636c206b03e4ce474d023208de46b899f1039acc990e793e98dfd SHA512 7e5ca0b4a0971497a47bc35cdc0e4f0db8c63d174398059832fc21d164ada79687f49ae11238ae7ed30d4d8f50f4e219891e3ab809657bd6320bfc63bae0aad5
+DIST fprintd-v1.90.9.tar.bz2 636538 BLAKE2B 8a2150887282aae722d143ec96a9c0c3b5dd066e4cba30c41d49b6f6afe95c26c585aec2d9b074d65dd1a3efd462dae294a98965a020c4e55a8cda7c00a827bb SHA512 2b0f3e5812dd29df2b78ff6082c75981c28af71fc07e19e7eb4743842562e7d5bfc0655d5fbb66bfb167bc3087100bd0f154257ad936eab03e9e8ccc2410481f
 EBUILD fprintd-0.8.1-r3.ebuild 1633 BLAKE2B 1787260f8a5bc98eb1c9c0f6f96f5c540c5223ada65faf93dc543faaed2a1916e85441f4f27d67c1f46e797d9fb6a09ee16596f94052a689fc3f5f7d107d37ea SHA512 0c02ceca9be196fb9d9f92b8929a64a96b34fa4c6e40c73931aa5ab61a8979f543729f7f9d43e5ca33afe2cfc1c4d6ea00774ff2cd5fb67ba4673a70bb1e4d1c
-EBUILD fprintd-1.90.8.ebuild 1610 BLAKE2B 15b77cb219868a97e5824b5da311d86306d104168c10fe579e5708b7d6888c2d04a806f29a9cdaa20742686e1ac35d269bb453d45b2d35b8c683d38259e4acf2 SHA512 b138146bc440308a95c700e56fba94419d00bc9ddaaff149d6de8207fe9fba94ce866f432a11e8d77cc6d70bb0d06dfcf3ea469c29d43fd3e9e71bab3278872d
-MISC metadata.xml 265 BLAKE2B 9c8a5ab87f06a4bb41749d77607017b51bd9a8a11167b44243fe3239fdd810b39d874abb0bc37d24977a59d6c1c0e9a447c3d18f5da2b4cd0feba10ccb14f048 SHA512 13396b6bc6de9ca04d98c0e94bd71b2f0b5b73238c21fac6f9fa3db9f5ab20efca035e84ae625b34a67bcc3c4f69acff1b57df96a28766ad59b6bbd65c8cb1b7
+EBUILD fprintd-1.90.8.ebuild 1609 BLAKE2B b740300da0690938cd618f1ed5a1380634e0bb041ed0b2634b1327b22a34c7ce5c763d9df1a980aad21cddc191c252258c2ad2128436cc20c2dc796042c87725 SHA512 9ca0ab30704e9b13be1e4569cc6f3e2a4d9047c07d52c0a292dc19287149052bc3dddf0b0f9ceb53f6698231a4b2764680dc9d08f6f38302d0dfee6eb3c371a2
+EBUILD fprintd-1.90.9.ebuild 1611 BLAKE2B a80960a38149b71ad8fe315293804d4c5c26173468f7d45aef781d619634b80b66b66fac05d9bded0edbe14ec788d228ba6c8f0fb8943cec9da6ebf10ad7fd59 SHA512 87f15ab1d74b026f1b028824c91a774e6b10f22a0364c63209c0efd07000a40d94c5b0d98595c066b79d42af660972d2150cf84a23fcb98a79807e3b8d18b791
+MISC metadata.xml 497 BLAKE2B 7fda00be12c7ce6dac7a00baea03d91414279033d86c10a233f00db2c876c224043c21f16c52922ac548c17861f381fa3989f9895bce41a0f34afa1d75e2e883 SHA512 29b70d7a55147573fbac8c6a40c8b5b82ebb5c6a6f2852f49d872eac9a44290b4d07e0ba1d754ae5e6656e00de05a47db6eae2dba5bb1fa2993115ff7d8aeded
diff --git a/sys-auth/fprintd/fprintd-0.8.1-r2.ebuild b/sys-auth/fprintd/fprintd-0.8.1-r2.ebuild
deleted file mode 100644
index 7769c96d3107..000000000000
--- a/sys-auth/fprintd/fprintd-0.8.1-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools pam systemd
-
-DESCRIPTION="D-Bus service to access fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/fprintd/"
-MY_PV="V_$(ver_rs 0- _)"
-SRC_URI="https://cgit.freedesktop.org/libfprint/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="doc pam static-libs"
-
-RDEPEND="
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	sys-auth/libfprint:0
-	sys-auth/polkit
-	pam? ( sys-libs/pam )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	doc? ( dev-libs/libxml2 dev-libs/libxslt )
-"
-
-S=${WORKDIR}/${MY_PV}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable pam) \
-		$(use_enable static-libs static) \
-		$(use_enable doc gtk-doc-html) \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		pammoddir=$(getpam_mod_dir)
-
-	keepdir /var/lib/fprint
-
-	find "${D}" -name "*.la" -delete || die
-
-	dodoc AUTHORS NEWS README{,.transifex} TODO
-	newdoc pam/README README.pam_fprintd
-	if use doc ; then
-		docinto html
-		dodoc doc/{fprintd-docs,version}.xml
-		docinto html/dbus
-		dodoc doc/dbus/net.reactivated.Fprint.{Device,Manager}.ref.xml
-	fi
-}
-
-pkg_postinst() {
-	elog "Please take a look at README.pam_fprintd for integration docs."
-}
diff --git a/sys-auth/fprintd/fprintd-1.90.8.ebuild b/sys-auth/fprintd/fprintd-1.90.8.ebuild
index 2fd9c7e7f03d..8063672e0390 100644
--- a/sys-auth/fprintd/fprintd-1.90.8.ebuild
+++ b/sys-auth/fprintd/fprintd-1.90.8.ebuild
@@ -9,9 +9,9 @@ DESCRIPTION="D-Bus service to access fingerprint readers"
 HOMEPAGE="https://gitlab.freedesktop.org/libfprint/fprintd"
 SRC_URI="https://gitlab.freedesktop.org/libfprint/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="amd64 ~ia64 x86"
 IUSE="doc pam systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-auth/fprintd/fprintd-1.90.9.ebuild b/sys-auth/fprintd/fprintd-1.90.9.ebuild
new file mode 100644
index 000000000000..0dfa760969cd
--- /dev/null
+++ b/sys-auth/fprintd/fprintd-1.90.9.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson pam systemd
+
+DESCRIPTION="D-Bus service to access fingerprint readers"
+HOMEPAGE="https://gitlab.freedesktop.org/libfprint/fprintd"
+SRC_URI="https://gitlab.freedesktop.org/libfprint/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="doc pam systemd test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+	sys-auth/libfprint:2
+	sys-auth/polkit
+	pam? (
+		systemd? ( sys-apps/systemd )
+		!systemd? ( sys-auth/elogind )
+		sys-libs/pam
+	)
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-lang/perl
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		dev-util/gtk-doc
+	)
+	test? (
+		dev-python/dbusmock
+		dev-python/dbus-python
+		dev-python/pycairo
+		pam? ( sys-libs/pam_wrapper )
+	)
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.90.7_0001-add-test-feature-and-make-tests-optional.patch"
+	"${FILESDIR}/${PN}-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch"
+)
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_configure() {
+		local emesonargs=(
+			$(meson_feature test)
+			$(meson_use pam)
+			-Dgtk_doc=$(usex doc true false)
+			-Dman=true
+			-Dsystemd_system_unit_dir=$(systemd_get_systemunitdir)
+			-Dpam_modules_dir=$(getpam_mod_dir)
+			-Dlibsystemd=$(usex systemd libsystemd libelogind)
+		)
+		meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	dodoc AUTHORS NEWS README TODO
+	newdoc pam/README README.pam_fprintd
+}
+
+pkg_postinst() {
+	elog "Please take a look at README.pam_fprintd for integration docs."
+}
diff --git a/sys-auth/fprintd/metadata.xml b/sys-auth/fprintd/metadata.xml
index 91a72ded097f..3479f4f0534a 100644
--- a/sys-auth/fprintd/metadata.xml
+++ b/sys-auth/fprintd/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<upstream>
-	<bugs-to>https://gitlab.freedesktop.org/libfprint/fprintd/issues</bugs-to>
-</upstream>
+	<maintainer type="person" proxied="yes">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://gitlab.freedesktop.org/libfprint/fprintd/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 403f721997a8..32c8aedb7566 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -1,12 +1,6 @@
 AUX libfprint-0.8.2-fix-implicit-declaration.patch 4831 BLAKE2B ec61d1ee189549f4456634b5b0157f32c61b2255330681b96bc50c73d9a5d51c1058f4f82b979ca4695d9d1065b0623e86be943f98c1582725bcddda0630156b SHA512 afd4e7c5ee65a91b17aa8bec4c6a0ba5b972e9f2586a0cfa7adc823d2a1f8d2378ed28928c5108870d2347f3edb2f343a24b2eaef6c015b7650834b4d76ceb73
-DIST libfprint-0.99.0.tar.gz 473925 BLAKE2B 799e3600393e4b25f7b0685ff0456ca391e5fcaef36e5b4475371cd07c848e40820dbbdc5a241fe11c6ee08b818380967129f85e177b5d8714b9dbc4d7b68ea1 SHA512 eca1d45baa23b7db1fcc5d7a9a396fe504aadc6ec2e68da32b5415fb0fff1227566d579271e0b34895ce7f3baa55314a0ccd20bb8c4adba253063b7b61284748
 DIST libfprint-1.0.tar.gz 475347 BLAKE2B cb560898cec11861c4529c0c37c328f74eaf271c1932ca5126b7bd6c82fafee24aff393c0fe223fef018a34a409647065d5f98a999c00f0e7a879e33bdfcd3cb SHA512 2d7f569368035cce0a579ef3412a1961c28aab254ae6174ce9ad11ce97b3dce824d0c6123adac12718cb074439e4d5b93bf978e5341824f179231d1faa219a26
-DIST libfprint-1.90.1.tar.gz 2348486 BLAKE2B d9f43253d8be874f3d78e19dbd148788d8abdc3cd0d6f5c931a4aad650acaf647f9c818c22a575f9ebe0a698a338693448f6f460c780adcd7140dedbdc4e025f SHA512 0548d29e55aaa59e73f0fd13cac6b85dd3a048358c365423e12884c3877c3e30422ee3fc4d18a3daba2f26383fb886f1d40a74dba5d947f7bdec6b8852995b4e
-DIST libfprint-1.90.2.tar.gz 4152489 BLAKE2B d8e8dde93acfc83dc253741517eb840b1a950b5626f2aabef4d4a44fcef2db95096e7d467ae3191c3478e93c0919acbf48010b0c4dd23a538466a25d8204ddf6 SHA512 58326714ce92514e2f95da84c94ca1286cadb0f0bb7de68f15aba0120a22e4a51d8bc6d3d7dc0a4e46e3620e2bd0b3247d07782a3308daf2edd44a4ddb60d226
 DIST libfprint-1.90.6.tar.gz 6375191 BLAKE2B 0e6300da25eb910dc50c3752731f877ad26093bd901a8de222ec21965596fe88e643b0923edc4e100d96e3910595bb00c3935ef8b19840ac5c4ff1d9405f2d09 SHA512 91ce2bbc5bed17d8a343fa78cede3d0f14a83706a9c950334db98933ceea5c11c3af81f9692108bf49b3a31f91a4be34812f27a7703f164ebffdbc29eb73fac8
-EBUILD libfprint-0.99.0.ebuild 1063 BLAKE2B d163d33f8318eb430630db1dedc51407c74b2f77326d4c3f4a6ca0a6113e3a1fe81c79eecb6026a414cec5c9a484acb9d8dee573dd53264ba915e3d3aa597f60 SHA512 06d91045e2e584e6b641fa31582a74f3e01078c2999708f69d7173dad3a053e2831bc3ed927d29919228ddde96939cc06508f754ce9a0ca1d22136e1c449ff58
 EBUILD libfprint-1.0.ebuild 1063 BLAKE2B a486982077da190caacf146bd9831146087cdc4da4ccf8debb5bbeef1641b72fc21bc16de6ce8b69dd82262e6911ece105840f78991eeed34e6c300099564e42 SHA512 bf1e942f98ffa922bbb3e5110ee87106ca56a2f646be2afc9441ed0d15cea0bbc04daddd92bb9169c02619c8571fd02705be7229ea09716d8298ca0b5904f021
-EBUILD libfprint-1.90.1-r1.ebuild 1257 BLAKE2B 872af7e9c2def63027f653e0a195cf6bcc34830f27a8316724c3328e956cd5ad0e545ee2f37430f91fe726d92d2c5d4ac5a67ad145b5672affe3fe8a3d1b3f4a SHA512 3f8520855ac5467b9efe8bb08f77b4acfbad1534be33bc2085e792ddc6991cacd6babd7c9e7d4200f81e3de2c71093caa26b7d59ffb7fe249f79811ea4c34ead
-EBUILD libfprint-1.90.2-r1.ebuild 1257 BLAKE2B 872af7e9c2def63027f653e0a195cf6bcc34830f27a8316724c3328e956cd5ad0e545ee2f37430f91fe726d92d2c5d4ac5a67ad145b5672affe3fe8a3d1b3f4a SHA512 3f8520855ac5467b9efe8bb08f77b4acfbad1534be33bc2085e792ddc6991cacd6babd7c9e7d4200f81e3de2c71093caa26b7d59ffb7fe249f79811ea4c34ead
-EBUILD libfprint-1.90.6.ebuild 1239 BLAKE2B 7a04b2aa6a38570214cd5966dd61b3d89c2e3b7eb6e35ef4fad056454a060ec5b576a3b40d42336602cdf94a8f3392c5312e98e468e6a8eefe71dfaf2ed506a8 SHA512 ba57bf3087ece0e41f88187535e2fdc3bab88a963df7947b5a2371d4e985c64d6811e8e10680df86ff753d01acc6e490859ca29e525bf0733207e269c006560f
+EBUILD libfprint-1.90.6.ebuild 1234 BLAKE2B df9486eb3ce2fd2787275def20152821a7b23b7b3127f4cb4449b0b27e20def4f750bdd3dec8c42107a18c0827babfc93d4e44bdfd2723d49345cb56470f93b8 SHA512 7c595c9fba771a0ff862f6b44f0435054965af29880670b2d1e2d3400c3da31277418c5ac64444c515b6e1e55b831ee0134a5f31a42a7eb7293d0dfff5d5fb66
 MISC metadata.xml 270 BLAKE2B 58797f8d76cba5c33ebb79a73d05c267baeefe8f0518a57fcce10fb7e7adf9b8468023c23ecc221caba6ba341af44cc601fa0948ee2c09e12f75b7efaf6d1f7f SHA512 60ad5c829063b48625dd3eff410eeb50f712f174773bb120a6ad8626a4f0efcc21cb95fdcd4e8285d5b73decf66c6355cdcfa77b2ee777e8139d6e815732d38a
diff --git a/sys-auth/libfprint/libfprint-0.99.0.ebuild b/sys-auth/libfprint/libfprint-0.99.0.ebuild
deleted file mode 100644
index 9e8a004c30b9..000000000000
--- a/sys-auth/libfprint/libfprint-0.99.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson udev
-
-DESCRIPTION="library to add support for consumer fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint"
-SRC_URI="https://github.com/freedesktop/libfprint/archive/V_$(ver_rs 0-3 '_').tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="examples"
-
-RDEPEND="dev-libs/glib:2
-	 dev-libs/nss
-	 virtual/libusb:1=
-	 x11-libs/gtk+:3
-	 x11-libs/pixman
-	 x11-libs/libX11
-	 x11-libs/libXv"
-
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
-
-S="${WORKDIR}/${PN}-V_$(ver_rs 0-3 '_')"
-
-src_configure() {
-		local emesonargs=(
-			-Ddoc=false
-			-Dx11-examples=$(usex examples true false)
-			-Ddrivers=all
-			-Dudev_rules=true
-			-Dudev_rules_dir=$(get_udevdir)/rules.d
-			--libdir=/usr/$(get_libdir)
-		)
-		meson_src_configure
-}
diff --git a/sys-auth/libfprint/libfprint-1.90.1-r1.ebuild b/sys-auth/libfprint/libfprint-1.90.1-r1.ebuild
deleted file mode 100644
index f58fbf922a7d..000000000000
--- a/sys-auth/libfprint/libfprint-1.90.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson udev
-
-DESCRIPTION="library to add support for consumer fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint"
-SRC_URI="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples +introspection"
-
-RDEPEND="dev-libs/glib:2
-	>=dev-libs/libgusb-0.3.1
-	dev-libs/nss
-	virtual/libusb:1=
-	x11-libs/gtk+:3
-	x11-libs/pixman
-	x11-libs/libX11
-	x11-libs/libXv
-	!>=${CATEGORY}/${PN}-1.90:0"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="dev-util/gtk-doc
-	virtual/pkgconfig
-	introspection? ( dev-libs/gobject-introspection )"
-
-PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_configure() {
-		local emesonargs=(
-			-Ddoc=false
-			$(meson_use examples gtk-examples)
-			$(meson_use introspection)
-			-Ddrivers=all
-			-Dudev_rules=true
-			-Dudev_rules_dir=$(get_udevdir)/rules.d
-			--libdir=/usr/$(get_libdir)
-		)
-		meson_src_configure
-}
diff --git a/sys-auth/libfprint/libfprint-1.90.2-r1.ebuild b/sys-auth/libfprint/libfprint-1.90.2-r1.ebuild
deleted file mode 100644
index f58fbf922a7d..000000000000
--- a/sys-auth/libfprint/libfprint-1.90.2-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson udev
-
-DESCRIPTION="library to add support for consumer fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint"
-SRC_URI="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples +introspection"
-
-RDEPEND="dev-libs/glib:2
-	>=dev-libs/libgusb-0.3.1
-	dev-libs/nss
-	virtual/libusb:1=
-	x11-libs/gtk+:3
-	x11-libs/pixman
-	x11-libs/libX11
-	x11-libs/libXv
-	!>=${CATEGORY}/${PN}-1.90:0"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="dev-util/gtk-doc
-	virtual/pkgconfig
-	introspection? ( dev-libs/gobject-introspection )"
-
-PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_configure() {
-		local emesonargs=(
-			-Ddoc=false
-			$(meson_use examples gtk-examples)
-			$(meson_use introspection)
-			-Ddrivers=all
-			-Dudev_rules=true
-			-Dudev_rules_dir=$(get_udevdir)/rules.d
-			--libdir=/usr/$(get_libdir)
-		)
-		meson_src_configure
-}
diff --git a/sys-auth/libfprint/libfprint-1.90.6.ebuild b/sys-auth/libfprint/libfprint-1.90.6.ebuild
index 52ce05e7e966..de51a02c5442 100644
--- a/sys-auth/libfprint/libfprint-1.90.6.ebuild
+++ b/sys-auth/libfprint/libfprint-1.90.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v${PV}/${P
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="examples +introspection"
 
 RDEPEND="dev-libs/glib:2
diff --git a/sys-auth/libyubikey/Manifest b/sys-auth/libyubikey/Manifest
index 45f962ab4747..980a0183b4e0 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 481 BLAKE2B e3164d7984a6038ba40ca8fd0d4b7aaaeb995e9a838de18e7c669551e5e5bcb7a93c32a722dfad3ae05de2fefb04fa5bf2320016ed3196dadde01669bda40215 SHA512 96f9587df3597714c4734de9f63d5149d68274b03b73fae3c968ffe0ced16de9022e2dd6fb29572159074e4409866fc2397a41730915178a54f755e747508e11
+EBUILD libyubikey-1.13.ebuild 468 BLAKE2B 9dfe88e6db341c3b3e829a1a8b2d43c90487570a419f51dc684b897d7655f9b19818dde65802d56946fc1592c3f7613270d3e047544e34cf7a5c2c2d1c45af07 SHA512 4719b7ee02fe2bab234662bb9f33424372e779e20a606f49c7c35ff7a039b32ea031c1875e87a2d889fa64cbb0db4b19f1397f920d73930425e44047630918ff
 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 77e3e6329d80..6fbe9d923189 100644
--- a/sys-auth/libyubikey/libyubikey-1.13.ebuild
+++ b/sys-auth/libyubikey/libyubikey-1.13.ebuild
@@ -1,18 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils autotools-utils
+EAPI=7
 
 DESCRIPTION="Yubico C low-level library"
 HOMEPAGE="https://github.com/Yubico/yubico-c"
-#http://opensource.yubico.com/yubico-c/releases.html
 SRC_URI="http://opensource.yubico.com/yubico-c/releases/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD-2"
+SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="static-libs"
 
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-auth/nss_ldap/Manifest b/sys-auth/nss_ldap/Manifest
index 237ba6ac36e1..28e220d22236 100644
--- a/sys-auth/nss_ldap/Manifest
+++ b/sys-auth/nss_ldap/Manifest
@@ -11,4 +11,5 @@ AUX nss_ldap-265-reconnect-timeouts.patch 2806 BLAKE2B b254a9959892a0a8ecb6e5377
 AUX nsswitch.ldap.diff 575 BLAKE2B 9578535ea6cff87ac21fa8f3a0a1b8d727c657a53318b378dd86b4dded15bac950e241af59b15b6898a1ed089d1c481f0615ca7de3ae4e07a231432920af7b52 SHA512 0d08d4dacea0213714cab864300e625158106245eeb34a7d4b983749dd4fa4156d3f36d6c2dd214efdf80cf926c37657eb00651bceb89907286a3310123399a0
 DIST nss_ldap-265.tar.gz 280976 BLAKE2B 31b233ef7680204abfb62408141609b9489e133327c787c59afedd9ac41194189bde26d1f3b0a885622f57ec769ddee2bdf7d274b9584d4d5002d1c016c86892 SHA512 c4584682968861dd5880992fe7d11c6005d94f0c17252ab1cda04380fd7a81b419ba7e87d0efa44c24c5ce5bf76b9fd8331034dddb4f1400f132eb2192472077
 EBUILD nss_ldap-265-r5.ebuild 3982 BLAKE2B c1c0fe18519694473ec42f310e6f3e45ba4f3adcb511d57a60b2c4ca61218276eb33307828068f9ec837559a647c7ff71aedf9217674efde016738ec4bbaf469 SHA512 a505439d2138460a055c6d00db152937493dc1ebe96316be937065ebfbb25de6345979e5e184f572832347dc7656904d03faa5a8abbbf64bcf4ca3ea4e9d4ede
+EBUILD nss_ldap-265-r8.ebuild 3728 BLAKE2B 52967dd0d189451057c9dac58ce5cee507e90dd3b1501a835d73b3297f1d0f85dcd5f4786d9f6273cb0b280f640d22ce23bae6a20954059c23cbda7de7abc7b5 SHA512 59aeefcc414fb80abe3634b56c0f983f309415125f0e96c816f5c00cf14c595f57e66c028ebeae195edfe803cb1e32bd6e3959b06ddc155da70a8d2eeb51b1a5
 MISC metadata.xml 418 BLAKE2B 0ee38489c1ce6a94df354e507b4e89255abe13a587b6b8887eb234eb1463da037194ad6f3e834e9ce4c5ef6e00c3082706a4b602a2ad39b9ea3eafff71596b22 SHA512 0395ea328ffe10ee708706b9e524ef863716dcb4d762a05546a64c2dbde75ab1ff3ec853c6973e421e0d3a7c837df96adf502aacce726016c4302ab466e1e7a8
diff --git a/sys-auth/nss_ldap/nss_ldap-265-r8.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r8.ebuild
new file mode 100644
index 000000000000..e6ed3ba6fc38
--- /dev/null
+++ b/sys-auth/nss_ldap/nss_ldap-265-r8.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools fixheadtails multilib-minimal prefix
+
+DESCRIPTION="NSS LDAP Module"
+HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
+SRC_URI="http://www.padl.com/download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="debug kerberos ssl sasl"
+
+DEPEND="
+	>=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}]
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r3[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${DEPEND}
+	!<net-fs/autofs-4.1.3
+"
+
+src_prepare() {
+	default
+
+	# Patch is for Prefix
+	# eprefixify is safe on non-Prefix systems, so go unconditional
+	# Note: comment this out or make it conditional on 'use prefix'
+	# if needs rebasing. Don't remove.
+	eapply "${FILESDIR}"/${P}-installdir.patch
+	eprefixify Makefile.am
+
+	# bug 438692
+	eapply -p0 "${FILESDIR}"/${P}-pthread.patch
+
+	eapply -p0 "${FILESDIR}"/nsswitch.ldap.diff
+
+	# Applied by upstream
+	#eapply "${FILESDIR}"/${PN}-239-tls-security-bug.patch
+
+	eapply -p0 "${FILESDIR}"/${PN}-249-sasl-compile.patch
+
+	eapply "${FILESDIR}"/${PN}-265-reconnect-timeouts.patch
+
+	# Applied by upstream
+	#eapply "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
+
+	eapply "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
+
+	sed -i.orig \
+		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
+		"${S}"/ldap.conf \
+		|| die
+
+	# Fix head/tail stuff
+	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
+
+	# Fix build borkage
+	local i
+	for i in Makefile.{in,am}; do
+		sed -i.orig \
+			-e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
+			"${S}"/$i || die
+	done
+
+	eapply "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
+
+	# Bug #214750, no automagic deps
+	eapply "${FILESDIR}"/${PN}-264-disable-automagic.patch
+
+	# Upstream forgets the version number sometimes
+	#sed -i \
+	#	-e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
+	#	"${S}"/configure.in || die
+
+	# Include an SONAME
+	eapply "${FILESDIR}"/${PN}-254-soname.patch
+
+	# Fix broken oneshot connections
+	eapply "${FILESDIR}/nss_ldap-265-missing-entries-oneshot.patch"
+
+	sed -i \
+		-e 's, vers_string , PERL5LIB="@top_srcdir@" @top_srcdir@/vers_string ,g' \
+		"${S}"/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# --enable-schema-mapping
+		--with-ldap-lib=openldap
+		--with-ldap-conf-file="${EPREFIX}/etc/ldap.conf"
+		--enable-paged-results
+		--enable-rfc2307bis
+		$(use_enable ssl)
+		$(use_enable sasl)
+		$(use_enable kerberos krb)
+	)
+
+	use debug && myconf+=( --enable-debugging )
+	use kerberos && myconf+=( --enable-configurable-krb5-ccname-gssapi )
+
+	# Neede to be careful with changing this
+	# bug #581306
+	multilib_is_native_abi && myconf+=( --libdir="${EPREFIX}/$(get_libdir)" )
+
+	ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	emake -j1 DESTDIR="${D}" \
+		INST_UID=${PORTAGE_USER:-root} \
+		INST_GID=${PORTAGE_GROUP:-root} \
+		install
+}
+
+multilib_src_install_all() {
+	# Dumb /usr/lib* -> /lib* symlinks gone wrong
+	rm -rf "${ED}"/usr/usr || die
+
+	insinto /etc
+	doins ldap.conf
+
+	# Append two blank lines and some skip entries
+	echo >>"${ED}"/etc/ldap.conf || die
+	echo >>"${ED}"/etc/ldap.conf || die
+	sed -i "${ED}"/etc/ldap.conf \
+		-e '$inss_initgroups_ignoreusers ldap,openldap,mysql,syslog,root,postgres' \
+		|| die
+
+	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
+		CVSVersionInfo.txt README nsswitch.ldap certutil
+
+	docinto docs
+	dodoc doc/*
+}
+
+pkg_postinst() {
+	elog "If you use a ldaps:// string in the 'uri' setting of"
+	elog "your /etc/ldap.conf, you must set 'ssl on'!"
+}
diff --git a/sys-auth/pam_mysql/Manifest b/sys-auth/pam_mysql/Manifest
index 680212193247..c56ea62407a8 100644
--- a/sys-auth/pam_mysql/Manifest
+++ b/sys-auth/pam_mysql/Manifest
@@ -1,3 +1,3 @@
 DIST pam_mysql-0.8.1.tar.gz 49613 BLAKE2B 1e3f6b0c8a11c8d328300fc820ddbbcd1601735de611e9317aab8f26ab2fbcf0f704e7a2c26de347fe9c4088c8171f0c278cd92e1668671871e5cd79db981241 SHA512 68aecc83c026c7616211a46b80f96fe822c8bd069a5ab6e9b170607bddac0dabe20410f78a1ac61ca1c1b2724ed0f0d99694d34bf28763270da3771c9ef05faf
-EBUILD pam_mysql-0.8.1-r1.ebuild 891 BLAKE2B a1f6acbf2ff21dee6ea660199ce7eb26a6d45edaf0b7b9cc8d4ff919298d90b1b39e1918e66e6c7b8e559c0638b2f59b40e7ddd5bd19be335f762af29dd6e543 SHA512 f85b3dfc52c6c773b49daad1a4b9fe848dd66ba6705f38ab0b83d5bc5480de0605e3cc6d1fbecde025fb431984efccca3cd515e9d26fd4d5b88d942a979a6231
+EBUILD pam_mysql-0.8.1-r1.ebuild 882 BLAKE2B 9cd44118c3f08968b9f0a342525faf8ea54f87fe831a2e808239f126e7a942a2bedba28e8112ba91264da54b40ed437ae05527c9b525d75de9c84db73db8cfd6 SHA512 6371f6247be3c991bccd1b44f0185eda2201a308d3db64f276f9155d547fce18982aac0703b751642a34725bda29145b45fc03db73ff36c24af3407fad4268f7
 MISC metadata.xml 404 BLAKE2B aa7d8e4f9b1d52a6b238bca975f697debb58355314621957db0afaea72490a1e7b386ef05f95d9707d68bee9178b6848affeeadcad6800b0746912916cf2d682 SHA512 d78e3f912015ea18a9385b21c0f7f4d29a2af8773c0a154fd41a1a16abc71af8a7d43b71fa66f835be1b44d3afc22f0333e741313dfccb6446d628962d25915b
diff --git a/sys-auth/pam_mysql/pam_mysql-0.8.1-r1.ebuild b/sys-auth/pam_mysql/pam_mysql-0.8.1-r1.ebuild
index a804c80bb49f..8467e5ea0d73 100644
--- a/sys-auth/pam_mysql/pam_mysql-0.8.1-r1.ebuild
+++ b/sys-auth/pam_mysql/pam_mysql-0.8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -41,5 +41,5 @@ src_configure() {
 src_install() {
 	default
 
-	rm "${ED%/}$(getpam_mod_dir)/pam_mysql.la" || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sys-auth/rtkit/Manifest b/sys-auth/rtkit/Manifest
index 3811f20847fb..a4440744be89 100644
--- a/sys-auth/rtkit/Manifest
+++ b/sys-auth/rtkit/Manifest
@@ -1,9 +1,5 @@
-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.12.tar.xz 127504 BLAKE2B c2132098b98f24c1f1662df08c9940772cdad9a326c0c4b9180aac2e0878b0c71e5917ab2535628aab12ff29546faef1c68f455625c77bc2bac25864dddfa4b6 SHA512 cee48058367b5b8a705203865538d0ab4bda9d2f1d06d155360922cb095b5d6a5b0311fdda6c45d9f33227324394ca5fd3b5a399fc71e11ea4c609eab18a7b04
 DIST rtkit-0.13.tar.xz 130796 BLAKE2B 842d04556a47c199bed9fc6bc9281c0d88f83e183f01ef57ecbd80ce72949a301d6682a3aab96e996e71b82d8e8c7a85e1d44524f2ed6fbdffc6bf236cdcadaa SHA512 c058d770a4ccfdf4e2e3a713748b6a705b6d3e148a903b9dbba4bba9d3ded2b819d7dfbfa37b9fad78e57c0a5f10f2f94226f8738f666e692a085ab297a36b36
-EBUILD rtkit-0.12-r1.ebuild 1165 BLAKE2B 8c0ddde1f2c211a31ccc0aade28c8d72b895d78bb999d38e862f0ed99e717767a462972fe9aa748dcb99a3331081e295e3a3e490391741a634d35712b94fab7d SHA512 438f4bf77aecaefc977634f58360a2c334739bacd9b005caa86f039411e530fe97fe06c6347e3febbca3ff69dcadd163eedb1c78c5049019b9607a24065efaa8
 EBUILD rtkit-0.13-r1.ebuild 1172 BLAKE2B 41dcb9d10f5d49dfb2e5b32c30a7577d10771bf399bd73a3e6b1f9a916b233f9b7bc8a3847545b4adc86cc79d874144dcd7c5f0a167d06213b1ad9a93378fa5b SHA512 90dc8100a4c8733d810adb3a65a65d49a0ec8d2d74efdd1a3279bed65bae95bc9496f185347199c6e96bac962c4372ac8fab719e03b8504575fefbb88e4ac207
 MISC metadata.xml 455 BLAKE2B cc63fbcf541ef442091a8bd3f8b2da07f629b71778b0ece05a18617088de554f6f8ffdc1d4aeed4a73bb957c88b470fcec52781704800575b364a3d2164b3914 SHA512 90bde656e242fe6cd7b408671f419ee54f73a781b67ee9047c8cd06d7fb29fee2882aed7ab95b42f22fdb65570f389e04931f8fa24506307b1bc8387c213850e
diff --git a/sys-auth/rtkit/files/rtkit-0.12_introspection_no_asm.patch b/sys-auth/rtkit/files/rtkit-0.12_introspection_no_asm.patch
deleted file mode 100644
index 5f634da85208..000000000000
--- a/sys-auth/rtkit/files/rtkit-0.12_introspection_no_asm.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-Backport of the upstream commit 7f24c26b6e6b5be0f50b42f86bbc7c43630687c9
-to 0.12 + include pre-generated C file for this release.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -51,7 +51,6 @@
- AC_PROG_GCC_TRADITIONAL
- AC_USE_SYSTEM_EXTENSIONS
- AC_SYS_LARGEFILE
--AM_PROG_AS
- 
- # GCC flags
- 
-@@ -125,6 +124,11 @@
- AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
- AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"])
- 
-+AC_PATH_PROG([XXD], [xxd], [xxd])
-+if test "$XXD" = xxd; then
-+        AC_MSG_WARN([xxd not found, cannot compile introspection XML])
-+fi
-+
- ###################################
- #            Output               #
- ###################################
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -63,7 +63,7 @@
- rtkit_daemon_SOURCES = \
- 	rtkit-daemon.c \
- 	rtkit.h \
--	xml-introspection.S
-+	xml-introspection.c
- rtkit_daemon_LDADD = \
- 	$(DBUS_LIBS) \
- 	$(LIBSYSTEMD_LIBS)
-@@ -94,7 +94,10 @@
- rtkit-daemon.service: rtkit-daemon.service.in
- 	$(AM_V_GEN)sed -e 's,@LIBEXECDIR\@,$(libexecdir),g' < $< > $@
- 
--xml-introspection.o: org.freedesktop.RealtimeKit1.xml
-+xml-introspection.c: org.freedesktop.RealtimeKit1.xml
-+	@echo 'const char introspect_xml[] = {' > $@
-+	$(AM_V_GEN)$(XXD) -i < $< >> $@
-+	@echo '};' >> $@
- 
- man8_MANS = rtkitctl.8
- 
---- /dev/null
-+++ b/xml-introspection.c
-@@ -0,0 +1,184 @@
-+const char introspect_xml[] = {
-+  0x3c, 0x21, 0x44, 0x4f, 0x43, 0x54, 0x59, 0x50, 0x45, 0x20, 0x6e, 0x6f,
-+  0x64, 0x65, 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x22, 0x2d,
-+  0x2f, 0x2f, 0x66, 0x72, 0x65, 0x65, 0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f,
-+  0x70, 0x2f, 0x2f, 0x44, 0x54, 0x44, 0x20, 0x44, 0x2d, 0x42, 0x55, 0x53,
-+  0x20, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x49, 0x6e, 0x74, 0x72,
-+  0x6f, 0x73, 0x70, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x31, 0x2e,
-+  0x30, 0x2f, 0x2f, 0x45, 0x4e, 0x22, 0x0a, 0x22, 0x68, 0x74, 0x74, 0x70,
-+  0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x66, 0x72, 0x65, 0x65, 0x64,
-+  0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x73,
-+  0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x73, 0x2f, 0x64, 0x62, 0x75,
-+  0x73, 0x2f, 0x31, 0x2e, 0x30, 0x2f, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x73,
-+  0x70, 0x65, 0x63, 0x74, 0x2e, 0x64, 0x74, 0x64, 0x22, 0x3e, 0x0a, 0x3c,
-+  0x6e, 0x6f, 0x64, 0x65, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65,
-+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x67, 0x2e, 0x66,
-+  0x72, 0x65, 0x65, 0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x2e, 0x52,
-+  0x65, 0x61, 0x6c, 0x74, 0x69, 0x6d, 0x65, 0x4b, 0x69, 0x74, 0x31, 0x22,
-+  0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6d, 0x65, 0x74, 0x68, 0x6f,
-+  0x64, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x4d, 0x61, 0x6b, 0x65,
-+  0x54, 0x68, 0x72, 0x65, 0x61, 0x64, 0x52, 0x65, 0x61, 0x6c, 0x74, 0x69,
-+  0x6d, 0x65, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x61, 0x72, 0x67, 0x20, 0x6e, 0x61,
-+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x22, 0x20,
-+  0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x74, 0x22, 0x20, 0x64, 0x69, 0x72,
-+  0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x69, 0x6e, 0x22, 0x2f,
-+  0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x3c, 0x61, 0x72, 0x67, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d,
-+  0x22, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x22, 0x20, 0x74,
-+  0x79, 0x70, 0x65, 0x3d, 0x22, 0x75, 0x22, 0x20, 0x64, 0x69, 0x72, 0x65,
-+  0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x69, 0x6e, 0x22, 0x2f, 0x3e,
-+  0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6d, 0x65, 0x74, 0x68, 0x6f,
-+  0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6d, 0x65, 0x74, 0x68,
-+  0x6f, 0x64, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x4d, 0x61, 0x6b,
-+  0x65, 0x54, 0x68, 0x72, 0x65, 0x61, 0x64, 0x52, 0x65, 0x61, 0x6c, 0x74,
-+  0x69, 0x6d, 0x65, 0x57, 0x69, 0x74, 0x68, 0x50, 0x49, 0x44, 0x22, 0x3e,
-+  0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x3c, 0x61, 0x72, 0x67, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22,
-+  0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x22, 0x20, 0x74, 0x79, 0x70,
-+  0x65, 0x3d, 0x22, 0x74, 0x22, 0x20, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74,
-+  0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x69, 0x6e, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c,
-+  0x61, 0x72, 0x67, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x68,
-+  0x72, 0x65, 0x61, 0x64, 0x22, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22,
-+  0x74, 0x22, 0x20, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-+  0x3d, 0x22, 0x69, 0x6e, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x61, 0x72, 0x67,
-+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6f, 0x72,
-+  0x69, 0x74, 0x79, 0x22, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x75,
-+  0x22, 0x20, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d,
-+  0x22, 0x69, 0x6e, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c,
-+  0x2f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x3c, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x20, 0x6e, 0x61, 0x6d,
-+  0x65, 0x3d, 0x22, 0x4d, 0x61, 0x6b, 0x65, 0x54, 0x68, 0x72, 0x65, 0x61,
-+  0x64, 0x48, 0x69, 0x67, 0x68, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74,
-+  0x79, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x3c, 0x61, 0x72, 0x67, 0x20, 0x6e, 0x61, 0x6d,
-+  0x65, 0x3d, 0x22, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x22, 0x20, 0x74,
-+  0x79, 0x70, 0x65, 0x3d, 0x22, 0x74, 0x22, 0x20, 0x64, 0x69, 0x72, 0x65,
-+  0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x69, 0x6e, 0x22, 0x2f, 0x3e,
-+  0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x3c, 0x61, 0x72, 0x67, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22,
-+  0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x22, 0x20, 0x74, 0x79,
-+  0x70, 0x65, 0x3d, 0x22, 0x69, 0x22, 0x20, 0x64, 0x69, 0x72, 0x65, 0x63,
-+  0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x69, 0x6e, 0x22, 0x2f, 0x3e, 0x0a,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64,
-+  0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6d, 0x65, 0x74, 0x68, 0x6f,
-+  0x64, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x4d, 0x61, 0x6b, 0x65,
-+  0x54, 0x68, 0x72, 0x65, 0x61, 0x64, 0x48, 0x69, 0x67, 0x68, 0x50, 0x72,
-+  0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x57, 0x69, 0x74, 0x68, 0x50, 0x49,
-+  0x44, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x3c, 0x61, 0x72, 0x67, 0x20, 0x6e, 0x61, 0x6d,
-+  0x65, 0x3d, 0x22, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x22, 0x20,
-+  0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x74, 0x22, 0x20, 0x64, 0x69, 0x72,
-+  0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x69, 0x6e, 0x22, 0x2f,
-+  0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x3c, 0x61, 0x72, 0x67, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d,
-+  0x22, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x22, 0x20, 0x74, 0x79, 0x70,
-+  0x65, 0x3d, 0x22, 0x74, 0x22, 0x20, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74,
-+  0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x69, 0x6e, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c,
-+  0x61, 0x72, 0x67, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x72,
-+  0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x22, 0x20, 0x74, 0x79, 0x70, 0x65,
-+  0x3d, 0x22, 0x69, 0x22, 0x20, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69,
-+  0x6f, 0x6e, 0x3d, 0x22, 0x69, 0x6e, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x3c, 0x2f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x3e, 0x0a,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x3c, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x20,
-+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x52, 0x65, 0x73, 0x65, 0x74, 0x4b,
-+  0x6e, 0x6f, 0x77, 0x6e, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x3c, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x20, 0x6e, 0x61, 0x6d, 0x65,
-+  0x3d, 0x22, 0x52, 0x65, 0x73, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x22, 0x2f,
-+  0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6d, 0x65, 0x74, 0x68, 0x6f,
-+  0x64, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x45, 0x78, 0x69, 0x74,
-+  0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f,
-+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22,
-+  0x52, 0x54, 0x54, 0x69, 0x6d, 0x65, 0x55, 0x53, 0x65, 0x63, 0x4d, 0x61,
-+  0x78, 0x22, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x78, 0x22, 0x20,
-+  0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x3d, 0x22, 0x72, 0x65, 0x61, 0x64,
-+  0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f,
-+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22,
-+  0x4d, 0x61, 0x78, 0x52, 0x65, 0x61, 0x6c, 0x74, 0x69, 0x6d, 0x65, 0x50,
-+  0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x22, 0x20, 0x74, 0x79, 0x70,
-+  0x65, 0x3d, 0x22, 0x69, 0x22, 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73,
-+  0x3d, 0x22, 0x72, 0x65, 0x61, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20,
-+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x4d, 0x69, 0x6e, 0x4e, 0x69, 0x63,
-+  0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x79, 0x70, 0x65,
-+  0x3d, 0x22, 0x69, 0x22, 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x3d,
-+  0x22, 0x72, 0x65, 0x61, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72,
-+  0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65,
-+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x67, 0x2e, 0x66,
-+  0x72, 0x65, 0x65, 0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x2e, 0x44,
-+  0x42, 0x75, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69,
-+  0x65, 0x73, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6d, 0x65,
-+  0x74, 0x68, 0x6f, 0x64, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x47,
-+  0x65, 0x74, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x3c, 0x61, 0x72, 0x67, 0x20, 0x6e, 0x61, 0x6d,
-+  0x65, 0x3d, 0x22, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65,
-+  0x22, 0x20, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d,
-+  0x22, 0x69, 0x6e, 0x22, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x73,
-+  0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x3c, 0x61, 0x72, 0x67, 0x20, 0x6e, 0x61, 0x6d, 0x65,
-+  0x3d, 0x22, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x22, 0x20,
-+  0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x69,
-+  0x6e, 0x22, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x73, 0x22, 0x2f,
-+  0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x3c, 0x61, 0x72, 0x67, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22,
-+  0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x20, 0x64, 0x69, 0x72, 0x65, 0x63,
-+  0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x6f, 0x75, 0x74, 0x22, 0x20, 0x74,
-+  0x79, 0x70, 0x65, 0x3d, 0x22, 0x76, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x3c, 0x2f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x3e, 0x0a,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x69, 0x6e,
-+  0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66,
-+  0x61, 0x63, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72,
-+  0x67, 0x2e, 0x66, 0x72, 0x65, 0x65, 0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f,
-+  0x70, 0x2e, 0x44, 0x42, 0x75, 0x73, 0x2e, 0x49, 0x6e, 0x74, 0x72, 0x6f,
-+  0x73, 0x70, 0x65, 0x63, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x0a,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x3c, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x20,
-+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x49, 0x6e, 0x74, 0x72, 0x6f, 0x73,
-+  0x70, 0x65, 0x63, 0x74, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x61, 0x72, 0x67, 0x20,
-+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x61, 0x74, 0x61, 0x22, 0x20,
-+  0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x73, 0x22, 0x20, 0x64, 0x69, 0x72,
-+  0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x6f, 0x75, 0x74, 0x22,
-+  0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6d, 0x65, 0x74,
-+  0x68, 0x6f, 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-+  0x20, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65,
-+  0x3e, 0x0a, 0x3c, 0x2f, 0x6e, 0x6f, 0x64, 0x65, 0x3e, 0x0a
-+};
---- a/xml-introspection.S
-+++ /dev/null
-@@ -1,7 +0,0 @@
--.section .rodata
--.global introspect_xml
--.type introspect_xml, @object
--
--introspect_xml:
--.incbin "org.freedesktop.RealtimeKit1.xml"
--.byte 0
diff --git a/sys-auth/rtkit/files/rtkit-0.12_libsystemd_optional.patch b/sys-auth/rtkit/files/rtkit-0.12_libsystemd_optional.patch
deleted file mode 100644
index 9d61f4e5685c..000000000000
--- a/sys-auth/rtkit/files/rtkit-0.12_libsystemd_optional.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -116,7 +116,15 @@
- AC_SEARCH_LIBS([cap_init], [cap])
- 
- PKG_CHECK_MODULES(DBUS, dbus-1)
--PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd)
-+
-+AC_ARG_ENABLE(systemd-integration,
-+	      AS_HELP_STRING([--enable-systemd-integration], [use the sd-daemon API to communicate with systemd]),
-+	      [enable_libsystemd=$enableval],
-+	      [enable_libsystemd=yes])
-+if test "x${enable_libsystemd}" != "xno"; then
-+	PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd)
-+	AC_DEFINE([HAVE_LIBSYSTEMD], [1], [Define to 1 if you have libsystemd and its header files])
-+fi
- 
- AC_ARG_WITH([systemdsystemunitdir],
-         AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
-@@ -142,5 +150,6 @@
-     localstatedir:          ${localstatedir}
-     Compiler:               ${CC}
-     CFLAGS:                 ${CFLAGS}
-+    systemd integration:    ${enable_libsystemd}
-     systemd unit directory: ${systemdsystemunitdir}
- "
---- a/rtkit-daemon.c
-+++ b/rtkit-daemon.c
-@@ -50,7 +50,10 @@
- #include <dirent.h>
- #include <syslog.h>
- #include <grp.h>
-+
-+#ifdef HAVE_LIBSYSTEMD
- #include <systemd/sd-daemon.h>
-+#endif
- 
- #include "rtkit.h"
- 
-@@ -1432,11 +1435,13 @@
-                 n_total_processes,
-                 n_users);
- 
-+#ifdef HAVE_LIBSYSTEMD
-         sd_notifyf(0,
-                    "STATUS=Supervising %u threads of %u processes of %u users.",
-                    n_total_threads,
-                    n_total_processes,
-                    n_users);
-+#endif
- 
- finish:
-         if (r) {
-@@ -2304,7 +2309,9 @@
- 
-         syslog(LOG_DEBUG, "Running.\n");
- 
-+#ifdef HAVE_LIBSYSTEMD
-         sd_notify(0, "STATUS=Running.");
-+#endif
- 
-         dbus_connection_set_exit_on_disconnect(bus, FALSE);
- 
diff --git a/sys-auth/rtkit/rtkit-0.12-r1.ebuild b/sys-auth/rtkit/rtkit-0.12-r1.ebuild
deleted file mode 100644
index f882e95fc82f..000000000000
--- a/sys-auth/rtkit/rtkit-0.12-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info
-
-DESCRIPTION="Realtime Policy and Watchdog Daemon"
-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"
-IUSE="systemd"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="acct-group/rtkit
-	acct-user/rtkit
-	sys-apps/dbus
-	sys-auth/polkit
-	sys-libs/libcap
-	systemd? ( sys-apps/systemd )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.12_introspection_no_asm.patch
-	"${FILESDIR}"/${PN}-0.12_libsystemd_optional.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 \
-		$(use_enable systemd systemd-integration)
-}