gentoo resync : 02.02.2022

17 files changed, 587 insertions, 179 deletions

diff --git a/sys-auth/AusweisApp2/AusweisApp2-1.22.3.ebuild b/sys-auth/AusweisApp2/AusweisApp2-1.22.3.ebuild
new file mode 100644
index 000000000000..fd2f4d5730d0
--- /dev/null
+++ b/sys-auth/AusweisApp2/AusweisApp2-1.22.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Official authentication app for German ID cards and residence permits"
+HOMEPAGE="https://www.ausweisapp.bund.de/"
+SRC_URI="https://github.com/Governikus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EUPL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebsockets:5[qml]
+	dev-qt/qtwidgets:5
+	net-libs/http-parser:0=
+	sys-apps/pcsc-lite
+	virtual/udev"
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF )
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/sys-auth/AusweisApp2/Manifest b/sys-auth/AusweisApp2/Manifest
index aa511cb35ff1..6cb06c0fe2d2 100644
--- a/sys-auth/AusweisApp2/Manifest
+++ b/sys-auth/AusweisApp2/Manifest
@@ -1,4 +1,6 @@
 DIST AusweisApp2-1.22.2.tar.gz 10886670 BLAKE2B b3ab93549da146bb4108b4fa6981deb8e02c9f6143b8c5cf00f302999ded95e32db0a2180242b83558fbbe49101d385fc067b89554848de12872e6af3d82d4d2 SHA512 1ec777e2b4bef67fd7727ab21bfa2aeb5ad1e615b232fa8a3640fe3d6193a4f050f1824f421d9410d94c4e591fe46b48e1544701752724e4e300086f5cb9f27a
+DIST AusweisApp2-1.22.3.tar.gz 10970793 BLAKE2B d6b3b3fb0005715150557f30a45002a90fc303c74706dc5714a1de239fb19a22552905aa9490f8c55cccc2d99eb46d077d424886eadcbb3d2574cdeb3f472ba2 SHA512 a8f654e66a47bb93116dfbe7941917f483c651deb947b8e4d287888d999551bc781e105b1cbf5d4445aa2241af542342f8c0f4edef7a4470a5366561f6f74b7a
 EBUILD AusweisApp2-1.22.2.ebuild 930 BLAKE2B b78892ad8d3dd7cc0ddeff0b937b3d6e1d37b136d59105aa86e8382200ef1619ffe55e847eadcd45ae03c4912b73465ea3289f2068f3125a0d59b7f4e3e235cd SHA512 a31f9558facb799ea41b7c84bfe5c381f2ddda9fe0b670934aeee8e0b5bb62b1554f967ce036aa75d5128fa0c10f3297e4d8f0c325c75e5a7d3b73e4d27e3bbc
+EBUILD AusweisApp2-1.22.3.ebuild 932 BLAKE2B 788d3c3dd3f87cb286a10625d1cddd2537876a3d78720f81abe770e8a28c767496c1f2a912304c2ae92db4c7ec809e5445e850fa82efa6ebe47637d90a5737fa SHA512 d0a449d2f34d9c671f0f41de39f27159e7a6b73f727177b163b0eff70e302c7aee3e133f3e23b7a6ec90e4d42989b6e90b2881c9c7817df09f414bb38ba81d65
 EBUILD AusweisApp2-9999.ebuild 891 BLAKE2B 924618ee8a22a0ef8ad2ef62a0e8fc7448033f142371c32f814965275cb376d46e15822a9899031cc03a8003cd7159c1a94e8652a0eaf8c4acfa34eeeffa4e40 SHA512 83506e86320528f4ac17c6ac9aa80060aa9ecdf875817d12f0a680dffaf242495546aa0076c1f8185dc7eccf3dd00e87490e7ccf18028b14a57330f9f75a9894
 MISC metadata.xml 338 BLAKE2B cc2c3169dbe9280f8ab769c2c2c38a691d0af53999169948243cca1200c2a6ef8bb2f97dcc0e8dcbd709f3660fa262bf5279d3acce525baefe91951f91f1eca7 SHA512 db2026e39095afa71c7431290d8032fb6cdf70138beb14ae5cc20f4c5d03a0fa334cd769c14fe1085520b8631947c35c654bbd686ccc2e60a308d19ef6eb9e83
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 31eeac660434..2994ef2ab653 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index e92607fd8c65..afe79dd6d439 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -7,5 +7,5 @@ AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f
 AUX elogind.init-r1 503 BLAKE2B 7e54688c91f78b46411edff04dd8544dea778864d34ec00a4f0f2c166b4062ebc6b01f201f1b7d1f22f6781c51ac22f924136c83c0b0cdb29d6aadf640a6c0e8 SHA512 97d78afe1c0833f3f632272904bd8338869639facb79cd2fae6a4bf58fc5b2dd960484e1f9945152ff13d075216cf4b48b6b234eb7738fbbf445eee2c20e88f2
 DIST elogind-246.10.tar.gz 1559256 BLAKE2B 17a8146ee08c8ccf167f25d89b1d4525050ed0b0baaad0d36924ad3c40ffc820ef1528b33557cf285ad06c9ac9c440137428c5a235a2acf563e56f2f8f07e208 SHA512 9db0f068ed94ec07bab4d764ccb38840af3d05a4b7c9c539721906f5381b509cb9a3cbfb0453a978210d306136368de6162578c600d522416ef2a7ac1b9f348b
 EBUILD elogind-246.10-r1.ebuild 4193 BLAKE2B c3c674fea3b7e95441e2f63147e39e377330fb9f056191c88a51bb2f9e5f8684346f9b5d7c8d8b85cdbfb973da244ea46d6dcb7fd380e39d5e0e6d102fa7c502 SHA512 3a4c0bef8cc0499dd91a90702e0fc500be615cf96c4045988b5c21b7f45e7a0acfcf7208699cc88084052db84d2c9bd10271b0864ae91ac2e0a10a7485799ec8
-EBUILD elogind-246.10-r2.ebuild 4085 BLAKE2B aac35092f8f84e251a5a353dea6aafa0acbf2cc667a3940497f6db0a08f56ab195ad94128e2ef3f061553bf7dadf81a82ab2fa0b32de8ed7aef090aec9fe0543 SHA512 c38b109cf0a74730b90a9d25efed0a96a6652e7e859aeb642333c4933ea95af0f1755fc8525d6f73edf49dee36d17df13b8015d34a8ec4e790d93be1176d9db0
+EBUILD elogind-246.10-r2.ebuild 4078 BLAKE2B e07dd16eb53f79976c6af4a3c17273d8ede0005b9de9a0db36ae326249c0325361a6df630db127a4451564b541ee543a638cf126e48bd1ae9d0d168080edbbe5 SHA512 f0301cc60be7730fb8347e1c77f2b2cd3dc2824a0d046ef375524a1354614a6cd4e5b18a023476103bded4033ebe52d5dd111c4476966d7aa987e4a17968dee0
 MISC metadata.xml 611 BLAKE2B fe45cf6b7f90d50e5518e3566371572983373853b8255d7b3824a4a3e71c1dec675f6ab7e490bc0c5e8cbee135b5005455aa69404493111dc3b2d855035a87e3 SHA512 52dcfb08f9d44c4420d949e7caed21a1166077f5475e976cba4f65dd2c7225df4294e21ff5bb7736c18efbe7e56913e33680c26c1fa51d17bbe1ab155ac058e1
diff --git a/sys-auth/elogind/elogind-246.10-r2.ebuild b/sys-auth/elogind/elogind-246.10-r2.ebuild
index e571a7a18750..55a49fd04edb 100644
--- a/sys-auth/elogind/elogind-246.10-r2.ebuild
+++ b/sys-auth/elogind/elogind-246.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 inherit linux-info meson pam udev xdg-utils
diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index 2a239d7b7b89..bf6747e6cda7 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -1,6 +1,7 @@
 AUX fprintd-0.8.1-fno-common.patch 1053 BLAKE2B a1cec2d6317ac0bffd131bf305c5ad0b2d69f8bf84e2de78dd5c2b04e2ae7f939243009cb38dc2c618568f1aa33eea0a53dc0ef93a96e998a90e4b6c5fdf3150 SHA512 4a762befbceda0bc35b576a1af42c7d49c7add5eb4f76eb0ec31d7ddb0f96e0a70591e64437d2a61fff8e9d903839340d31719c354753e7af01dbb3e585081bc
 AUX fprintd-1.90.7_0001-add-test-feature-and-make-tests-optional.patch 2426 BLAKE2B 838b56e110fdf670816fb59e7ad30b908c54b8ee1cbbe4fda0334ac068265c8cdcb7e48200796b0872718099dea918554641dc02670e32e5f9369f7cc05fb95b SHA512 553e6baa7d1a90971627e3e1303488734596f83fea4413d2a4ce2688f003cded95182b652622f758f4e347b54a1294837a2014a9e36badc25e8b254947a54736
 AUX fprintd-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch 1144 BLAKE2B f417baf7a6d686a753381501ef2e6df6bc867c4a938d47b70def205b92a3ea20adb2ab55a1ff26d921ef433d846c150bb24d9a4102a39e61c2e424b53effe66e SHA512 4a234200e9a03ba3acb710857a64d35d84a4b954d9289a8fc400355dd27cc8cdf5da6d2dc11e60add57aae04e93e4c890b8a75e4984516fad14f9236acf0f699
+AUX fprintd-1.94.1-fix-meson-0.61-build.patch 4544 BLAKE2B 321971f95833db2d6957ccee1f67907e8590d91da24d684bda7ca95b50028e721b28e887a90b101c311813df0d7ca4870f12801ae91e280f00b2567c7fddc874 SHA512 73836daf2366f47bd2c69d6d50a70150778cedf04d946123be72c73f976fcd674173b0f349d9df197d06afec5190c742e8b0726380215e3dc95dcba1a49f33bf
 DIST fprintd-0.8.1.tar.bz2 75254 BLAKE2B bf59c47c3d0186677bfd180e472e13773afebd4c3438e0e8e8cce34156df1c64c142b73d541fa876b96d4881e6967745a8c29be310dd33a509cb1863c836634e SHA512 438098fb677b742fdb279f3df85a1f2c800fce7498130c09b7408f21656ff256323b3bce4c22a2499e52c2ca7cddbc7f26033be7869939d23f9b5c436aa1f252
 DIST fprintd-v1.90.8.tar.bz2 635139 BLAKE2B 4f9e5c395c32dd5de3f5ed4d17e81c28a55de0f411deb3ccbc5d1330129be2bc8263c63c61a5e4910f74e49ebbbf508e858f5ee131eb4552e2ea8ab167bc6021 SHA512 0f38e0ce9f7c1459ba5359d0834569fe5d3f5ec3c9499d008dc39b9c869bbfa1cb293b1d96d22f9f36708f26984a1b3f0776685d628df69f1ed6db14de04a489
 DIST fprintd-v1.90.9.tar.bz2 636538 BLAKE2B 8a2150887282aae722d143ec96a9c0c3b5dd066e4cba30c41d49b6f6afe95c26c585aec2d9b074d65dd1a3efd462dae294a98965a020c4e55a8cda7c00a827bb SHA512 2b0f3e5812dd29df2b78ff6082c75981c28af71fc07e19e7eb4743842562e7d5bfc0655d5fbb66bfb167bc3087100bd0f154257ad936eab03e9e8ccc2410481f
@@ -12,5 +13,5 @@ EBUILD fprintd-1.90.8.ebuild 1616 BLAKE2B 6c34b97ff30d9d1b1e249779e74f403b78692b
 EBUILD fprintd-1.90.9.ebuild 1646 BLAKE2B ebdbca6dd9bef2a51b60cb24d9ae8e614081ace89ae84b4007c88d8a6853ac20a0b1667aacd5ac5373aa7fe0fac46c5eadc2bd3f1aaf3a5d23b770c2e311eb50 SHA512 3a68129c63d411d1b2bb8343bbdc150229f88e0124b705e1716c5b6b0cf1f9f6a0cd6f1dac04a3349a2d6b9896c2ebcb5eacd830bb8aaa77843199ef611e2dcd
 EBUILD fprintd-1.92.0.ebuild 2137 BLAKE2B 9e388fa3f8fad59afad75d144f17b78af50468fa187f76a2efe2450cda17407e46e1bc25a4ee32cbc536ada07a8614f6c13d0cdbe56a153c5cf0932d397c9d51 SHA512 b0dcd1b6a071a9418d27a9e73b02b94b348ef82f09bd6874d431dc9feb8dcd564a507ee4000b3cc4b0035483fb5309352d5b32f860477e0569087d18f703671e
 EBUILD fprintd-1.94.0.ebuild 2176 BLAKE2B 163b4f798e313366bbf6cd1a0959e494dac1f28c034dddbd74cb402d9d21569df2962169a88bde70346a3c9e153a0f1fe5aba35fa28edaca1030d5d4cc4a53a8 SHA512 98c0f365a171b4e617868ff72b1f3b9e2eb0927447f6cfa7cafbc0e71be1e7805296fb1d3503135be6fb0befacc872254dc26cf380e0f4c7bfcbdc3ddb368172
-EBUILD fprintd-1.94.1.ebuild 2178 BLAKE2B 07a858460e4cd745cb7dba43c61596753cc2f352886fe5eb1b702c35d2e89e51c20f0995f023a93d6eb2b76b377b349ee1495bdba0285a57bf9b9ac1e52bfd40 SHA512 3cac10117dbd61feb71f7e98bfe2651b1a3acfb289529baf1a8cebb30221f809f68bc68a57bd6f09d34d26abe8050a5d76ed4f1fbd02bc44a951120aa4190f91
+EBUILD fprintd-1.94.1.ebuild 2225 BLAKE2B 4d5055e72734e236b8874dd11dcd26eddce270ea0d6f1300f6d0058427d140d9b48aacea0c626e05c5962615c98ad381de390dd5f02eda8f5aebe9088f4ed15c SHA512 5956894a079d8473c3c7cf142de81b5980265199ae4a285ddbe0fe636a527960456b41a31c701227989cd16e71fef1fed34ccb2ddff03baa0e601ae49d9300be
 MISC metadata.xml 270 BLAKE2B 0f6d61908167c717898b4ba7602bf3b429736afea65a4367231066bb481a2923d25760b31741774b37727f3dcf41ea748340899e7b4a865901036d9bdf52cf0e SHA512 f93613d657594e747e743541df6df87ef7152ccf381f343bc30ac55966bc7ea212697e350d454ddc2f7c91d9485aace053084a668a69a20d6ee74340cbfe1f25
diff --git a/sys-auth/fprintd/files/fprintd-1.94.1-fix-meson-0.61-build.patch b/sys-auth/fprintd/files/fprintd-1.94.1-fix-meson-0.61-build.patch
new file mode 100644
index 000000000000..e7f78320d1b9
--- /dev/null
+++ b/sys-auth/fprintd/files/fprintd-1.94.1-fix-meson-0.61-build.patch
@@ -0,0 +1,121 @@
+https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch
+https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/2c34cef5ef2004d8479475db5523c572eb409a6b.patch
+https://bugs.gentoo.org/831753
+
+From f4256533d1ffdc203c3f8c6ee42e8dcde470a93f Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 11 Jan 2022 21:06:35 -0500
+Subject: [PATCH] use more idiomatic/correct embedded shell scripting
+
+Formatting arguments into code is fragile, and meson natively knows how
+to pass files as arguments via argv. So pass them as arguments to the
+shell.
+---
+ doc/dbus/meson.build | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build
+index 802938e..861da64 100644
+--- a/doc/dbus/meson.build
++++ b/doc/dbus/meson.build
+@@ -19,11 +19,10 @@ foreach interface_file: dbus_interfaces_files
+         capture: true,
+         command: [
+             bash, '-c',
+-            'cat @INPUT@;' +
+-            xsltproc.path() + ' @0@/@1@ '.format(
+-                meson.source_root(),
+-                files('spec-to-docbook.xsl')[0]) +
+-            interface_file.full_path() + '| tail -n +2;',
++            'cat "$1"; "$2" "$3" "$4" | tail -n +2',
++            '_', # argv0 ignored
++            '@INPUT@',
++            xsltproc, files('spec-to-docbook.xsl')[0], interface_file
+         ],
+     )
+ endforeach
+-- 
+GitLab
+
+From 2c34cef5ef2004d8479475db5523c572eb409a6b Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 11 Jan 2022 20:46:29 -0500
+Subject: [PATCH] remove pointless copying of files into build directory
+
+I'm not entirely sure what this did, but it seems to be obsoleted by
+commit 93bad825406d13ed5eb2cf27541dc58194bef8f3.
+---
+ doc/dbus/meson.build                          |  6 +++---
+ src/meson.build                               | 20 ++++++-------------
+ ....xml => net.reactivated.Fprint.Device.xml} |  0
+ ...xml => net.reactivated.Fprint.Manager.xml} |  0
+ 4 files changed, 9 insertions(+), 17 deletions(-)
+ rename src/{device.xml => net.reactivated.Fprint.Device.xml} (100%)
+ rename src/{manager.xml => net.reactivated.Fprint.Manager.xml} (100%)
+
+diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build
+index 861da64..431127d 100644
+--- a/doc/dbus/meson.build
++++ b/doc/dbus/meson.build
+@@ -9,13 +9,13 @@ docbook_xml_header = custom_target('docbook_xml_header',
+ )
+ 
+ dbus_interfaces_refs = []
+-foreach interface_file: dbus_interfaces_files
+-    basename = run_command('basename', interface_file.full_path(), '.xml').stdout().strip()
++foreach interface_file: dbus_interfaces
++    basename = run_command('basename', interface_file, '.xml').stdout().strip()
+     dbus_interfaces_refs += custom_target(basename + '_ref',
+         input: docbook_xml_header,
+         output: basename + '.ref.xml',
+         build_by_default: true,
+-        depends: interface_file,
++        depend_files: interface_file,
+         capture: true,
+         command: [
+             bash, '-c',
+diff --git a/src/meson.build b/src/meson.build
+index 1df6216..a7ce3fe 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -1,22 +1,14 @@
+ bash = find_program('bash')
+-dbus_interfaces = ['Manager', 'Device']
+-dbus_interfaces_files = []
++dbus_interfaces = files(
++    'net.reactivated.Fprint.Manager.xml',
++    'net.reactivated.Fprint.Device.xml',
++)
+ 
+-foreach interface_name: dbus_interfaces
+-    interface = interface_name.to_lower()
+-    interface_file = interface + '.xml'
+-    dbus_interfaces_files += custom_target('dbus_interface_' + interface,
+-        input: interface_file,
+-        output: 'net.reactivated.Fprint.@0@.xml'.format(interface_name),
+-        command: ['cp', '@INPUT@', '@OUTPUT@'],
+-        install: true,
+-        install_dir: dbus_interfaces_dir,
+-    )
+-endforeach
++install_data(dbus_interfaces, install_dir: dbus_interfaces_dir)
+ 
+ # NOTE: We should pass "--glib-min-required 2.64" but cannot
+ fprintd_dbus_sources_base = gnome.gdbus_codegen('fprintd-dbus',
+-    sources: dbus_interfaces_files,
++    sources: dbus_interfaces,
+     autocleanup: 'all',
+     interface_prefix: 'net.reactivated.Fprint.',
+     namespace: 'FprintDBus',
+diff --git a/src/device.xml b/src/net.reactivated.Fprint.Device.xml
+similarity index 100%
+rename from src/device.xml
+rename to src/net.reactivated.Fprint.Device.xml
+diff --git a/src/manager.xml b/src/net.reactivated.Fprint.Manager.xml
+similarity index 100%
+rename from src/manager.xml
+rename to src/net.reactivated.Fprint.Manager.xml
+-- 
+GitLab
+
+
diff --git a/sys-auth/fprintd/fprintd-1.94.1.ebuild b/sys-auth/fprintd/fprintd-1.94.1.ebuild
index 8a0c86a78391..1cf6326d13f2 100644
--- a/sys-auth/fprintd/fprintd-1.94.1.ebuild
+++ b/sys-auth/fprintd/fprintd-1.94.1.ebuild
@@ -53,6 +53,7 @@ BDEPEND="
 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"
+	"${FILESDIR}/${P}-fix-meson-0.61-build.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index bbad24423d42..50b201da876f 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -8,8 +8,6 @@ AUX nss-pam-ldapd-0.9.11-tests.patch 1226 BLAKE2B f8fd1170bae8d206dab6fb11437db7
 AUX nss-pam-ldapd-0.9.11-use-mkstemp.patch 789 BLAKE2B da9525e66873be615cfe90f6a03b717c8a0caf03edfbd3c9eba60391a3e92504c01093e254294ac3e063045de07df260573371a5405c8eea87917fc30056daca SHA512 a01a15b94977efc37d9d518049aaa52f308b0e3597aea6e17ca7badc790cccb617eb9154dcd3fef897b4093b147f8261dfc32ac2fc0ba48ba82573653fa358d8
 AUX nss-pam-ldapd-0.9.4-disable-py3-only-linters.patch 403 BLAKE2B 2e17a92b3650ce4e6627be7ddb2f656cd9ab53e49d7e2b11d078dac0d7a00015d88d861bfdc1378eb25c1b9750ed3811023cc95b04ccf9d028ffc5899dc01cd5 SHA512 c8cccb044a641f673f12db9717bda4c0c4d91bd1933342595d8f3f540449459c5cf14263133487195b223670d450873f608e3ce5b6f1ca775ca7fe0180a9f962
 AUX pynslcd.init 515 BLAKE2B 711ba152ea9cc52198171e451889ab42a224581bae7e4378846f480063ed9a672fdb38b153d6941364d3d06e325d9feb95f6fd17885b4e6181d99393cb54de0a SHA512 56334d86cc027e538d8a0bf9a8b87308e3ae6e91be608a4a630f21c57cc41b6cb5dc6fb3220fed1ca555dd4da6a5c7c10b2776f9e49a7b71a96ece21fc65fed7
-DIST nss-pam-ldapd-0.9.11.tar.gz 777878 BLAKE2B c2b442786dd788dcf4373939ed52b4585d1821a7168fdd342ded3c99ef9ac8f3e4af0ac360f842b61885c1f2bc2ef85a0ce9ce0c1027bc974d0ba5242505657f SHA512 2b307805667526b85c724e113fe38899eee397e5c8673e89090d4836ce6d0ffcf18dd022d6c20a5e11d4138e736451b841a0f16ba379d524de4faaaf02906645
 DIST nss-pam-ldapd-0.9.12.tar.gz 791983 BLAKE2B af580d400230db709f7ac09720edd6127b3b26c6987d1e8f6d6535ad8e68fd8cb5cf2a3319e4456fb2af28aba6528f7a5cdc28463ccfee747dbbf6abc35eee87 SHA512 5eca4851a9bcb2779548d193a363a143d6106bfc6463b8d3f0c2d5d7d227ec1e680861383d4813f40b44d1be2ce5f7ed019d838f7f6796e15f96f7411d3bb8f6
-EBUILD nss-pam-ldapd-0.9.11-r3.ebuild 4484 BLAKE2B 5cfd1eb115e3e25bffcdeef08a8b334896d8f2e492d8de397176fca1bf9ab469d7f1a23080d6cf620f3ba9d0c238805c5d4e1c82668c8608a5d48a318ed8a601 SHA512 fba3cf79f08c1d6c2a6c80320b01d5b9ec5bb4ce0ac17d6175a5fe34fcee698d6b8f87250f36f75edaba24f4e15d632c439ead4bfec14760c343f42e0527d22e
 EBUILD nss-pam-ldapd-0.9.12.ebuild 4484 BLAKE2B 5cfd1eb115e3e25bffcdeef08a8b334896d8f2e492d8de397176fca1bf9ab469d7f1a23080d6cf620f3ba9d0c238805c5d4e1c82668c8608a5d48a318ed8a601 SHA512 fba3cf79f08c1d6c2a6c80320b01d5b9ec5bb4ce0ac17d6175a5fe34fcee698d6b8f87250f36f75edaba24f4e15d632c439ead4bfec14760c343f42e0527d22e
 MISC metadata.xml 1170 BLAKE2B 5c121a0afae864d757fda18c8546e494804c9b9d6a7d6fe2ad485b6a7bb2ed291776063407721222fa765251c9ca4d945740e8a0aa53da670747fb35cf1b8f9e SHA512 ba534679ae3b983a9b143530112f6495a4a4b5b82077095b3cc62965c1cf808c7a2d098410c00bee195112c5e7ff3afe4b368fa9a1662ce22cf48634229df7cf
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild
deleted file mode 100644
index ec02a5427df5..000000000000
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit prefix python-r1 autotools multilib multilib-minimal systemd s6 tmpfiles
-
-DESCRIPTION="NSS module for name lookups using LDAP"
-HOMEPAGE="https://arthurdejong.org/nss-pam-ldapd/"
-SRC_URI="https://arthurdejong.org/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug kerberos +pam pynslcd sasl test +utils"
-RESTRICT="!test? ( test )"
-
-COMMON_DEP="
-	acct-group/nslcd
-	acct-user/nslcd
-	net-nds/openldap[${MULTILIB_USEDEP}]
-	sasl? ( dev-libs/cyrus-sasl[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	sys-libs/pam[${MULTILIB_USEDEP}]
-	utils? ( ${PYTHON_DEPS} )
-	pynslcd? (
-		dev-python/python-ldap[${PYTHON_USEDEP}]
-		dev-python/python-daemon[${PYTHON_USEDEP}]
-	)
-	!sys-auth/nss_ldap
-	!sys-auth/pam_ldap
-"
-RDEPEND="${COMMON_DEP}"
-DEPEND="${COMMON_DEP}
-	test? (
-		${PYTHON_DEPS}
-		dev-python/pylint[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/automake
-"
-
-REQUIRED_USE="
-	utils? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} pynslcd )
-"
-
-PATCHES=(
-	"${FILESDIR}/nss-pam-ldapd-0.9.4-disable-py3-only-linters.patch"
-	"${FILESDIR}/nss-pam-ldapd-0.9.11-use-mkstemp.patch"
-	"${FILESDIR}/nss-pam-ldapd-0.9.11-relative-imports.patch"
-	"${FILESDIR}/nss-pam-ldapd-0.9.11-tests.patch"
-	"${FILESDIR}/nss-pam-ldapd-0.9.11-tests-py39.patch"
-)
-
-src_prepare() {
-	default
-	use utils && python_setup
-	touch pynslcd/__init__.py || die "Could not create __init__.py for pynslcd"
-	mv pynslcd/pynslcd.py pynslcd/main.py || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local -a myconf=(
-		--disable-utils
-		--enable-warnings
-		--with-ldap-lib=openldap
-		--with-ldap-conf-file=/etc/nslcd.conf
-		--with-nslcd-pidfile=/run/nslcd/nslcd.pid
-		--with-nslcd-socket=/run/nslcd/socket
-		--with-nss-flavour=glibc
-		$(use_enable pynslcd)
-		$(use_enable debug)
-		$(use_enable kerberos)
-		$(use_enable pam)
-		$(use_enable sasl)
-	)
-
-	# nss libraries always go in /lib on Gentoo
-	if multilib_is_native_abi ; then
-		myconf+=("--with-pam-seclib-dir=${EPREFIX}/$(get_libdir)/security")
-		myconf+=("--libdir=${EPREFIX}/$(get_libdir)")
-	else
-		myconf+=("--with-pam-seclib-dir=/$(get_libdir)/security")
-		myconf+=("--libdir=/$(get_libdir)")
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_test() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	ln -s ../pynslcd/constants.py utils/constants.py || die
-	python_foreach_impl python_test
-	popd >/dev/null || die
-}
-
-python_test() {
-	cp -l "${S}"/pynslcd/*.py pynslcd/ || die "Could not copy python files for tests"
-	nonfatal emake check || die "tests failed with ${EPYTHON}"
-}
-
-multilib_src_install_all() {
-	local script
-
-	newinitd "${FILESDIR}"/nslcd.init nslcd
-	s6_install_service nslcd "${FILESDIR}"/nslcd.s6
-
-	insinto /usr/share/nss-pam-ldapd
-	doins "${WORKDIR}/${P}/nslcd.conf"
-
-	fperms o-r /etc/nslcd.conf
-
-	if use utils; then
-		python_moduleinto nslcd
-		python_foreach_impl python_domodule utils/*.py
-
-		for script in chsh getent; do
-			python_foreach_impl python_newscript utils/${script}.py ${script}.ldap
-		done
-	fi
-	if use pynslcd; then
-		rm -rf "${D}"/usr/share/pynslcd
-		python_moduleinto pynslcd
-		python_foreach_impl python_domodule pynslcd/*.py
-		python_scriptinto /usr/sbin
-		python_foreach_impl python_newscript pynslcd/main.py pynslcd
-		newinitd "${FILESDIR}"/pynslcd.init pynslcd
-	fi
-
-	newtmpfiles "${FILESDIR}"/nslcd-tmpfiles.conf nslcd.conf
-	systemd_newunit "${FILESDIR}"/nslcd.service nslcd.service
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if use pynslcd; then
-		python_moduleinto pynslcd
-		python_foreach_impl python_domodule pynslcd/*.py
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process nslcd.conf
-
-	echo
-	elog "For this to work you must configure /etc/nslcd.conf"
-	elog "This configuration is similar to pam_ldap's /etc/ldap.conf"
-	echo
-	elog "In order to use nss-pam-ldapd, nslcd needs to be running. You can"
-	elog "start it like this:"
-	elog "  # /etc/init.d/nslcd start"
-	echo
-	elog "You can add it to the default runlevel like so:"
-	elog " # rc-update add nslcd default"
-	elog
-	elog "If you have >=sys-apps/openrc-0.16.3, you can also use s6"
-	elog "to supervise this service."
-	elog "To do this, emerge sys-apps/s6 then add nslcd-s6"
-	elog "default runlevel instead of nslcd."
-	elog
-	elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf"
-	elog " is now named /etc/nslcd.conf"
-	echo
-}
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index e946af257bfb..b37c4eefd3fa 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -1,8 +1,13 @@
 AUX polkit-0.115-elogind.patch 1069 BLAKE2B 6c5a3d7d3e716a994b951181808f64d864e6ca58b3a018a5354022f08c6e7c1d8987366c9777f47cc970916ad9fe39f288a1b1643113fc99745f333e02dab56f SHA512 06432fa56788699762c6978484640554f91728a1cb40679eb47b8514b3c7aa23aac5b9c26586eb4d7043a0af1b319bbe7f869d24844d9151317299b74a8e8f7f
+AUX polkit-0.117-CVE-2021-3560.patch 909 BLAKE2B a912312e60fc442645a94a93795912220019a668f18a6a0d4e3c34ea23ea4155b37673b5e8db516cbe389b49423ef6008006823897dc41795ee5ac5def3e2708 SHA512 e62f362a4486e5eab04a0acd582d5cb9c1def19dd1707a9e1c861bdea6f576e6c24838c722526908de9cad63a699b513e4f56d1d5bbb0fcb9578f542d65b2953
+AUX polkit-0.120-CVE-2021-4034.patch 1933 BLAKE2B f125b6c55428c2c12dbb89e7bc8619400d914f5b2b955d4e6ec24c4ac2cb02ba8e624f5c1a61dda74b1c24cd5c81a3f2985b9f4cf828bd801d940e707d62bec7 SHA512 cd32461e95297e29d7a5b7ba999b4f27c8296c964eb41c94b4511dc5181538ad0a50554340dae3c5a87629e07b8b22477478ffbf478f0fc16de856f8efb791d6
+AUX polkit-0.120-meson.patch 1201 BLAKE2B cae66df3db2c92392a07d3b39219a3c16819a9c2393b2bbfc65a32e4beac921e17bb09220cbfe2622edc21c7f81c64058cf60c315d48b8d80ba643d8336d5171 SHA512 f3a4feafae83dcc8bd665557cfc755c08888a78575313d510ec5ff140a2174a709755aa5e23081291ade6b2d333887a10848ae5c7a99b700a2e18476af21844d
 DIST polkit-0.117.tar.gz 1554536 BLAKE2B 1cf7e0ff9db19a29be626f4bea96c9e2ef8b1eab4b8287a5f1f4d2a818b86d58c1c4c4a41849d95e31559dba1b18853a31e934ebbadd8e07f94dfd58b45240e0 SHA512 c10ea984f2386fe436e58a2866e5323afc80d24f744f0ee61d966941259aa491bd96b07d911434aa731b300c3cca25b647804b396501175ab5b3c53384e94c70
 DIST polkit-0.119.tar.gz 1387409 BLAKE2B aeb605598393d1cab40f7c77954008a0392600584c5fe8cc9acaa0e122418ee48b9cce0b6839189ea415277ff0ae4dbd5b7c71cb910aa349dcaf7e1f3f70ef06 SHA512 0260fb15da1c4c1f429e8223260981e64e297f1be8ced42f6910f09ea6581b8205aca06c9c601eb4a128acba2f468de0223118f96862ba769f95721894cf1578
 DIST polkit-0.120.tar.gz 1626659 BLAKE2B 745727445b4946d44b8ea470d21ac131ca7706e83f5dbaf85cf3541ac60a1bbe23b3bf3172a62d9256ebb3dae02d2b2d476e3e0f7fe79a80c47864a120e62ed9 SHA512 db072769439d5e17d0eed681e7b94251b77828c1474b40fe40b94293903a64333e7fa17515a3270648691f04a1374d8b404405ead6abf292a8eb8483164adc46
 EBUILD polkit-0.117-r2.ebuild 3330 BLAKE2B 844d327d9f6c391ea89b305677adf98e823718f620c307586bf96172678dc94a4b1a5ad870e6ebacf0fd579839b73359de33fa0173f46c425e0f7cd0228c6bd3 SHA512 99673f56722f4e105eaad28a3f8e1a9aee1664e5552e940bf286bf84a76a52145745905f080f859ce4991a29ce6f3e47f6ab3d59a012e69ffd71de98557ca8bd
+EBUILD polkit-0.117-r3.ebuild 3427 BLAKE2B 3725159a592d2072fde8f5e4d6ae6a12dfd24f86e81b8c84a7d36beda89e22588d87b63c1e6b96c65533423b383a1ad1f9a68462b95fa5068fdb238d446afd9a SHA512 44065ebcdf8b6bafc4b87a9841526ed72e6b27490d3ca550383b38b4d5c98f370e9feac3c13617acf3c760dbc8b91ac47454e62a052b0c674af71d73c088d6e5
 EBUILD polkit-0.119-r2.ebuild 3302 BLAKE2B e56f5505dfdfa245ed3dd78199de5439d7ff6d5ddb8778d785c69e3900dfdc7f9d4aa46e101bab2eee7ebdb4097eecfda0f9d29be97dbd348629cc218a988d87 SHA512 32e836e9c17bb7aae519031beaf35a3cba4da983bb29e875b7dcbc8ffae5d0a15218147904d0d942557210e240ffb252d9d548c6bf508027be337feba9e61923
-EBUILD polkit-0.120-r1.ebuild 2929 BLAKE2B 26c0521d065a3ec363876a1e7dad8f76063a2255da89755b892cdba7f343f942866fed290a89ea471188f38ad5ae3eaed59e1805ea06caccc984bcb0d46af9c1 SHA512 3712df9a5233ad467493dead6ad46b4919b527576191aea4c9c88825c3f39422f63051b3b8b983379936f1753518744bd63606b5f811068dc6402c8ba2393b4f
+EBUILD polkit-0.120-r1.ebuild 2990 BLAKE2B c8a385dc9199099fc966388d918c25a7a154aa76b4cc58020a202d84680a0b2ee9a437f3ab21a8f5bd4be2fe5610becb13a98a14ed7e8e6ee6f06a5db629f558 SHA512 b9d8356a7d5eeb555912f8598a5dafa90d9adae6210dabf12d87c49aea2bf1a59282891cf9d5877c170fc3ec77c45f428390066da0b485ebe3c0d4e37f877635
+EBUILD polkit-0.120-r2.ebuild 3172 BLAKE2B 2c007462e5a72cd8a7b0ff3d47b1292e161e2354ef981f0096b9208f07593d195e38cd31cb5674cb5c0988848913032b8c3a556866dd5725cadb720e47a05f2f SHA512 4e19152d5f873e3265020c025ea341d52e9592d9d6fcc7c0b4160a7f9b36287d3ee86f339fbf889afbcd3d68d7fa4b00c119624b45f9337fd31c24e21422fa2c
 MISC metadata.xml 410 BLAKE2B 5b1bae6f1252bbafdc0ddd0eefeaca74f93ed183f46a2e4f22f36656c681d87acdd6ea86807a4b68350c1c8197cb97b6b421a88f5f0a2322b1fd85c599c09b39 SHA512 9b097838f0e0dfdbb788e4794e667d43ba3f3a08de45fffa5826142b8416afde68ec0202c429f1cd6f79ad9681b050c8aef736a8399d9551ea8784c97c123766
diff --git a/sys-auth/polkit/files/polkit-0.117-CVE-2021-3560.patch b/sys-auth/polkit/files/polkit-0.117-CVE-2021-3560.patch
new file mode 100644
index 000000000000..9c3ce20cf574
--- /dev/null
+++ b/sys-auth/polkit/files/polkit-0.117-CVE-2021-3560.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/794052
+
+From a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81 Mon Sep 17 00:00:00 2001
+From: Jan Rybar <jrybar@redhat.com>
+Date: Wed, 2 Jun 2021 15:43:38 +0200
+Subject: [PATCH] GHSL-2021-074: authentication bypass vulnerability in polkit
+
+initial values returned if error caught
+---
+ src/polkit/polkitsystembusname.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/polkit/polkitsystembusname.c b/src/polkit/polkitsystembusname.c
+index 8daa12c..8ed1363 100644
+--- a/src/polkit/polkitsystembusname.c
++++ b/src/polkit/polkitsystembusname.c
+@@ -435,6 +435,9 @@ polkit_system_bus_name_get_creds_sync (PolkitSystemBusName           *system_bus
+   while (!((data.retrieved_uid && data.retrieved_pid) || data.caught_error))
+     g_main_context_iteration (tmp_context, TRUE);
+ 
++  if (data.caught_error)
++    goto out;
++
+   if (out_uid)
+     *out_uid = data.uid;
+   if (out_pid)
+-- 
+GitLab
+
diff --git a/sys-auth/polkit/files/polkit-0.120-CVE-2021-4034.patch b/sys-auth/polkit/files/polkit-0.120-CVE-2021-4034.patch
new file mode 100644
index 000000000000..22bb71d14204
--- /dev/null
+++ b/sys-auth/polkit/files/polkit-0.120-CVE-2021-4034.patch
@@ -0,0 +1,72 @@
+https://www.qualys.com/2022/01/25/cve-2021-4034/pwnkit.txt
+https://bugs.gentoo.org/832057
+https://gitlab.freedesktop.org/polkit/polkit/-/commit/a2bf5c9c83b6ae46cbd5c779d3055bff81ded683.patch
+
+From a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 Mon Sep 17 00:00:00 2001
+From: Jan Rybar <jrybar@redhat.com>
+Date: Tue, 25 Jan 2022 17:21:46 +0000
+Subject: [PATCH] pkexec: local privilege escalation (CVE-2021-4034)
+
+--- a/src/programs/pkcheck.c
++++ b/src/programs/pkcheck.c
+@@ -363,6 +363,11 @@ main (int argc, char *argv[])
+   local_agent_handle = NULL;
+   ret = 126;
+ 
++  if (argc < 1)
++    {
++      exit(126);
++    }
++
+   /* Disable remote file access from GIO. */
+   setenv ("GIO_USE_VFS", "local", 1);
+ 
+--- a/src/programs/pkexec.c
++++ b/src/programs/pkexec.c
+@@ -488,6 +488,15 @@ main (int argc, char *argv[])
+   pid_t pid_of_caller;
+   gpointer local_agent_handle;
+ 
++
++  /*
++   * If 'pkexec' is called THIS wrong, someone's probably evil-doing. Don't be nice, just bail out.
++   */
++  if (argc<1)
++    {
++      exit(127);
++    }
++
+   ret = 127;
+   authority = NULL;
+   subject = NULL;
+@@ -614,10 +623,10 @@ main (int argc, char *argv[])
+ 
+       path = g_strdup (pwstruct.pw_shell);
+       if (!path)
+-	{
++        {
+           g_printerr ("No shell configured or error retrieving pw_shell\n");
+           goto out;
+-	}
++        }
+       /* If you change this, be sure to change the if (!command_line)
+ 	 case below too */
+       command_line = g_strdup (path);
+@@ -636,7 +645,15 @@ main (int argc, char *argv[])
+           goto out;
+         }
+       g_free (path);
+-      argv[n] = path = s;
++      path = s;
++
++      /* argc<2 and pkexec runs just shell, argv is guaranteed to be null-terminated.
++       * /-less shell shouldn't happen, but let's be defensive and don't write to null-termination
++       */
++      if (argv[n] != NULL)
++      {
++        argv[n] = path;
++      }
+     }
+   if (access (path, F_OK) != 0)
+     {
+GitLab
diff --git a/sys-auth/polkit/files/polkit-0.120-meson.patch b/sys-auth/polkit/files/polkit-0.120-meson.patch
new file mode 100644
index 000000000000..5e144688d374
--- /dev/null
+++ b/sys-auth/polkit/files/polkit-0.120-meson.patch
@@ -0,0 +1,42 @@
+From e7f3d9e8341df64e2abc3910dafb1113a84bff07 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@debian.org>
+Date: Mon, 25 Oct 2021 20:21:27 +0100
+Subject: [PATCH] Don't pass positional parameters to i18n.merge_file
+
+These were always ignored, and Meson 0.60.0 disallowed them.
+
+Resolves: https://gitlab.freedesktop.org/polkit/polkit/-/issues/160
+Reference: https://github.com/mesonbuild/meson/pull/9445
+Signed-off-by: Simon McVittie <smcv@debian.org>
+---
+ actions/meson.build      | 1 -
+ src/examples/meson.build | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/actions/meson.build b/actions/meson.build
+index 2abaaf3..1e3f370 100644
+--- a/actions/meson.build
++++ b/actions/meson.build
+@@ -1,7 +1,6 @@
+ policy = 'org.freedesktop.policykit.policy'
+ 
+ i18n.merge_file(
+-  policy,
+   input: policy + '.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+diff --git a/src/examples/meson.build b/src/examples/meson.build
+index c6305ab..8c18de5 100644
+--- a/src/examples/meson.build
++++ b/src/examples/meson.build
+@@ -1,7 +1,6 @@
+ policy = 'org.freedesktop.policykit.examples.pkexec.policy'
+ 
+ i18n.merge_file(
+-  policy,
+   input: policy + '.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+-- 
+GitLab
+
diff --git a/sys-auth/polkit/polkit-0.117-r3.ebuild b/sys-auth/polkit/polkit-0.117-r3.ebuild
new file mode 100644
index 000000000000..61e56bfdcdb3
--- /dev/null
+++ b/sys-auth/polkit/polkit-0.117-r3.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools pam pax-utils systemd xdg-utils
+
+DESCRIPTION="Policy framework for controlling privileges for system-wide services"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit https://gitlab.freedesktop.org/polkit/polkit"
+SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc ~x86"
+IUSE="elogind examples gtk +introspection kde nls pam selinux systemd test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="^^ ( elogind systemd )"
+
+BDEPEND="
+	acct-user/polkitd
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/glib
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	introspection? ( dev-libs/gobject-introspection )
+"
+DEPEND="
+	dev-lang/spidermonkey:68[-debug]
+	dev-libs/glib:2
+	dev-libs/expat
+	elogind? ( sys-auth/elogind )
+	pam? (
+		sys-auth/pambase
+		sys-libs/pam
+	)
+	!pam? ( virtual/libcrypt:= )
+	systemd? ( sys-apps/systemd:0=[policykit] )
+"
+RDEPEND="${DEPEND}
+	acct-user/polkitd
+	selinux? ( sec-policy/selinux-policykit )
+"
+PDEPEND="
+	gtk? ( || (
+		>=gnome-extra/polkit-gnome-0.105
+		>=lxde-base/lxsession-0.5.2
+	) )
+	kde? ( kde-plasma/polkit-kde-agent )
+"
+
+DOCS=( docs/TODO HACKING NEWS README )
+
+PATCHES=(
+	# bug 660880
+	"${FILESDIR}"/polkit-0.115-elogind.patch
+
+	"${FILESDIR}"/polkit-0.117-CVE-2021-3560.patch
+	"${FILESDIR}"/polkit-0.120-CVE-2021-4034.patch
+)
+
+QA_MULTILIB_PATHS="
+	usr/lib/polkit-1/polkit-agent-helper-1
+	usr/lib/polkit-1/polkitd"
+
+src_prepare() {
+	default
+
+	sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
+
+	# Workaround upstream hack around standard gtk-doc behavior, bug #552170
+	sed -i -e 's/@ENABLE_GTK_DOC_TRUE@\(TARGET_DIR\)/\1/' \
+		-e '/install-data-local:/,/uninstall-local:/ s/@ENABLE_GTK_DOC_TRUE@//' \
+		-e 's/@ENABLE_GTK_DOC_FALSE@install-data-local://' \
+		docs/polkit/Makefile.in || die
+
+	# disable broken test - bug #624022
+	sed -i -e "/^SUBDIRS/s/polkitbackend//" test/Makefile.am || die
+
+	# Fix cross-building, bug #590764, elogind patch, bug #598615
+	eautoreconf
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}"/var
+		--disable-static
+		--enable-man-pages
+		--disable-gtk-doc
+		--disable-examples
+		$(use_enable elogind libelogind)
+		$(use_enable introspection)
+		$(use_enable nls)
+		$(usex pam "--with-pam-module-dir=$(getpam_mod_dir)" '')
+		--with-authfw=$(usex pam pam shadow)
+		$(use_enable systemd libsystemd-login)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_enable test)
+		--with-os-type=gentoo
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
+	pax-mark mr src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		docinto examples
+		dodoc src/examples/{*.c,*.policy*}
+	fi
+
+	diropts -m 0700 -o polkitd
+	keepdir /usr/share/polkit-1/rules.d
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+	chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+}
diff --git a/sys-auth/polkit/polkit-0.120-r1.ebuild b/sys-auth/polkit/polkit-0.120-r1.ebuild
index 0f0f2900683f..3ec998fa6f02 100644
--- a/sys-auth/polkit/polkit-0.120-r1.ebuild
+++ b/sys-auth/polkit/polkit-0.120-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -61,6 +61,9 @@ QA_MULTILIB_PATHS="
 	usr/lib/polkit-1/polkitd"
 
 src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/polkit-0.120-meson.patch"
+	)
 	default
 
 	sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
diff --git a/sys-auth/polkit/polkit-0.120-r2.ebuild b/sys-auth/polkit/polkit-0.120-r2.ebuild
new file mode 100644
index 000000000000..952906f5d88e
--- /dev/null
+++ b/sys-auth/polkit/polkit-0.120-r2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson pam pax-utils systemd xdg-utils
+
+DESCRIPTION="Policy framework for controlling privileges for system-wide services"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit https://gitlab.freedesktop.org/polkit/polkit"
+SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~mips ppc64 ~riscv ~s390 x86"
+IUSE="examples gtk +introspection kde pam selinux systemd test"
+#RESTRICT="!test? ( test )"
+# Tests currently don't work with meson. See
+#   https://gitlab.freedesktop.org/polkit/polkit/-/issues/144
+RESTRICT="test"
+
+BDEPEND="
+	acct-user/polkitd
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/glib
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+	introspection? ( dev-libs/gobject-introspection )
+"
+DEPEND="
+	dev-lang/spidermonkey:78[-debug]
+	dev-libs/glib:2
+	dev-libs/expat
+	pam? (
+		sys-auth/pambase
+		sys-libs/pam
+	)
+	!pam? ( virtual/libcrypt:= )
+	systemd? ( sys-apps/systemd:0=[policykit] )
+	!systemd? ( sys-auth/elogind )
+"
+RDEPEND="${DEPEND}
+	acct-user/polkitd
+	selinux? ( sec-policy/selinux-policykit )
+"
+PDEPEND="
+	gtk? ( || (
+		>=gnome-extra/polkit-gnome-0.105
+		>=lxde-base/lxsession-0.5.2
+	) )
+	kde? ( kde-plasma/polkit-kde-agent )
+"
+
+DOCS=( docs/TODO HACKING NEWS README )
+
+QA_MULTILIB_PATHS="
+	usr/lib/polkit-1/polkit-agent-helper-1
+	usr/lib/polkit-1/polkitd"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/polkit-0.120-meson.patch"
+		"${FILESDIR}/polkit-0.120-CVE-2021-4034.patch"
+	)
+	default
+
+	sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local emesonargs=(
+		--localstatedir="${EPREFIX}"/var
+		-Dauthfw="$(usex pam pam shadow)"
+		-Dexamples=false
+		-Dgtk_doc=false
+		-Dman=true
+		-Dos_type=gentoo
+		-Dsession_tracking="$(usex systemd libsystemd-login libelogind)"
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(meson_use introspection)
+		$(meson_use test tests)
+		$(usex pam "-Dpam_module_dir=$(getpam_mod_dir)" '')
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
+	pax-mark mr src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest
+}
+
+src_install() {
+	meson_src_install
+
+	if use examples ; then
+		docinto examples
+		dodoc src/examples/{*.c,*.policy*}
+	fi
+
+	diropts -m 0700 -o polkitd
+	keepdir /usr/share/polkit-1/rules.d
+
+	# meson does not install required files with SUID bit. See
+	#  https://bugs.gentoo.org/816393
+	# Remove the following lines once this has been fixed by upstream
+	# (should be fixed in next release: https://gitlab.freedesktop.org/polkit/polkit/-/commit/4ff1abe4a4c1f8c8378b9eaddb0346ac6448abd8)
+	fperms u+s /usr/bin/pkexec
+	fperms u+s /usr/lib/polkit-1/polkit-agent-helper-1
+}
+
+pkg_postinst() {
+	chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+	chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+}