gentoo auto-resync : 03:06:2024 - 00:07:25

24 files changed, 189 insertions, 425 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 4258dc1707f6..848dfe26a850 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index efc6f0d70e0e..1060f4e66fb2 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -1,8 +1,9 @@
 AUX dtc-1.7.0-meson-macos.patch 1303 BLAKE2B 1b479891e150a990fb560aac8e74604ee97373ab7bb26f3171552bcad6c8c649e0c4a57630ab85bdcff1cf49c7318a3e154112be65e70a2fd078774d4ed17ed1 SHA512 ff70b6396410ad45dd49fb83cf2762ba081a8f221e9713934497b562b119951f0a50eb041680ba2318059537af54015047aacf03f38259005cfb86b0f002961f
 AUX dtc-1.7.0-meson-tests.patch 1265 BLAKE2B f121b676e2f711e6be75ff4f2c7a077b7e9efd682cd29dea08135958e8c9f29ce9b4ff42c1bfc22d77927d749d44264647e47e49d260a7760151fa1dae93648b SHA512 4afb9bc6b2615ba58ae5d997807563ec8672a9253a9d5a15ea5ed476ab1cf80229de3ca0289f2b016c31d6bb9adc2ecae46d004425244cc699768159b8929761
+AUX fix-tests-for-Python3.12.patch 1914 BLAKE2B bdb612e1aa3d42a6d17bf1663f40cec2ebc2222ebedcd67bcb6f20c4cdb389f9cc0c4f7513d56de659996f76d0311551dc0e513612cdd7cc367126ca26398de7 SHA512 2fc10469b4c1f5016cdccd1a1e24d1f0984267c88efe88d268d52d9a49c441d832f53bf004a5223810c82e0f10cf5b515d6a6ddb56e49ca5bb86b55724634f0b
 DIST dtc-1.6.0.tar.xz 158584 BLAKE2B 47b15b5df7f5d87369d6daaad87f2989a80865f2fab19f89d050d390a9f8319bcd86a36e12f7cc8d62947bb4d1335769071d0e3ea0a6e16861aea163e78f4696 SHA512 15433b24f1d6b7ed1f8066d050bd1bcbf988731aa38147564e3dd04b5f69af8d69e03befdc621a768526c620425a9bdd24aad4f9ff135930d6a1eeb0625f7de3
 DIST dtc-1.7.0.tar.xz 165548 BLAKE2B de433a1034b7ef75559bf39f85695d0b275cfd17bf100c12b6186e226a65659053f9b5a053f20e64a5a0670ea3e728edd0e624c26287bd264594569408065bab SHA512 d3ba6902a9a2f2cdbaff55f12fca3cfe4a1ec5779074a38e3d8b88097c7abc981835957e8ce72971e10c131e05fde0b1b961768e888ff96d89e42c75edb53afb
 EBUILD dtc-1.6.0.ebuild 1504 BLAKE2B f9159399aec94cb17d0920543031bd7c076f22bac9cce5ad8cb7f45d762d4ff67b287e35cbca287c1e3cd951be0cd01bc45dff3fa978990b064e827a0d43ee9f SHA512 89d8c7de7ef502b13874f4cdb48b0fd2a545f817ba568659a2e8741455a70a4a22406a58f59a8ebaddacceceb32df421b956113901e8c6071e52eb3cb3e99ddb
-EBUILD dtc-1.7.0.ebuild 1610 BLAKE2B b84a90679c2decf914e5990957aef4237ff03d31682faf2ad52c7193c86734a02a2ece35165e2385ead1f3147ed2f10bea9f8d7eb9f631d6e11f5286a283b30a SHA512 77080099ec63babd08559edef3b8c0187ffe481734aa4a93e252203de112623fc9d99854d3320c5c83b8d58549ab23d0b0842ccf0bbe43e19d61adf3a979a888
-EBUILD dtc-9999.ebuild 1529 BLAKE2B aa7b0c6f73db039a802f67bb51cf90dc1adf88f6f8df8bbb71f2b2817b22cfd9570d569eeed9c0c8a21cd74b2ef1a618cb297693017ff487d593a983783745e1 SHA512 7945f2fffb16faf25444962323b17f20023da742e2cba209c187777935c8220f026b78033bb6e9b4d30ca6742761a303d189780f5a1ac0a4d823e9ef37066eac
+EBUILD dtc-1.7.0.ebuild 1656 BLAKE2B 75d792778b89f1af2328c1246eaedac5f8da391c9d72a91765357080103102caf31205e82008bb761fa113380631b7b51d1bfc98110ec96c108031eabddbf6ff SHA512 4f78ed0eee341e1779f4b0b87afde3e6522848c49fec376995990879bb63eaa618e1dd8267397c7cc57f1038cff5da00314b0032f425339604b9628992176022
+EBUILD dtc-9999.ebuild 1529 BLAKE2B 72c6452b6b76364eccb0ae7176871cc669ecd5bce5764342f7c91402385e05fe15fd7feb7f32af78b6caaf43fa26af48a7810e4bb3b5f0969b40c2f6171111f8 SHA512 9705931992cf9b108532f79f5ce4dd0ee98dc464e9eef0a75694c0641cb1e00dace8ffdd9ec15a40a2c74acc362e5a644d529859a510d19f082590354673967b
 MISC metadata.xml 492 BLAKE2B dc331e157119b6db3bb419e04722511406295b39ee40bcae29dbbe3f8fa3737aa221c2d61b16b45b8361c1b6ffadd634ffa65377d33cc808d11a8128389bdfd0 SHA512 cf2441cf6ea1075cf633edf903a54a637cbaff2545ccd65290c1c1b3f5452ce3d74df5ce4ffe68ab15857eaea1ffeac7f3e80b42fb4dae3af1c3636e4b0766fb
diff --git a/sys-apps/dtc/dtc-1.7.0.ebuild b/sys-apps/dtc/dtc-1.7.0.ebuild
index f674774c831b..bcb50ad71a85 100644
--- a/sys-apps/dtc/dtc-1.7.0.ebuild
+++ b/sys-apps/dtc/dtc-1.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit meson python-single-r1
 
 if [[ ${PV} == 9999 ]] ; then
@@ -44,6 +44,7 @@ DOCS=(
 PATCHES=(
 	"${FILESDIR}"/${P}-meson-tests.patch
 	"${FILESDIR}"/${P}-meson-macos.patch
+	"${FILESDIR}"/fix-tests-for-Python3.12.patch
 )
 
 pkg_setup() {
diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild
index dd2aadfad28a..ad87023887a3 100644
--- a/sys-apps/dtc/dtc-9999.ebuild
+++ b/sys-apps/dtc/dtc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit meson python-single-r1
 
 if [[ ${PV} == 9999 ]] ; then
diff --git a/sys-apps/dtc/files/fix-tests-for-Python3.12.patch b/sys-apps/dtc/files/fix-tests-for-Python3.12.patch
new file mode 100644
index 000000000000..7a08648f3835
--- /dev/null
+++ b/sys-apps/dtc/files/fix-tests-for-Python3.12.patch
@@ -0,0 +1,43 @@
+Description: Python3.12 causes breakage for get_mem_rsv in pylibfdt.
+ 
+ Author: Héctor Orón Martínez <zumbi@debian.org>
+
+---
+
+Bug: https://github.com/dgibson/dtc/issues/123
+Bug-Debian: https://bugs.debian.org/1061318
+Bug-Ubuntu: https://launchpad.net/bugs/2051399
+Last-Update: 2024-01-30
+
+--- device-tree-compiler-1.7.0.orig/tests/pylibfdt_tests.py
++++ device-tree-compiler-1.7.0/tests/pylibfdt_tests.py
+@@ -418,9 +418,14 @@ class PyLibfdtBasicTests(unittest.TestCa
+     def testReserveMap(self):
+         """Test that we can access the memory reserve map"""
+         self.assertEqual(2, self.fdt.num_mem_rsv())
+-        self.assertEqual([ 0xdeadbeef00000000, 0x100000],
+-                          self.fdt.get_mem_rsv(0))
+-        self.assertEqual([123456789, 0o10000], self.fdt.get_mem_rsv(1))
++        if sys.version_info.major >= 3 and sys.version_info.minor >= 12:
++            self.assertEqual([0, 0xdeadbeef00000000, 0x100000],
++                             self.fdt.get_mem_rsv(0))
++            self.assertEqual([0, 123456789, 0o10000], self.fdt.get_mem_rsv(1))
++        else:
++            self.assertEqual([0xdeadbeef00000000, 0x100000],
++                             self.fdt.get_mem_rsv(0))
++            self.assertEqual([123456789, 0o10000], self.fdt.get_mem_rsv(1))
+ 
+     def testEmpty(self):
+         """Test that we can create an empty tree"""
+@@ -615,7 +620,10 @@ class PyLibfdtSwTests(unittest.TestCase)
+ 
+         fdt = sw.as_fdt()
+         self.assertEqual(2, fdt.num_mem_rsv())
+-        self.assertEqual([TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
++        if sys.version_info.major >= 3 and sys.version_info.minor >= 12:
++            self.assertEqual([0, TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
++        else:
++            self.assertEqual([TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
+ 
+         # Make sure we can add a few more things
+         with sw.add_node('another'):
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index b158327f5ccd..99f8965850ad 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -1,5 +1,7 @@
 DIST ethtool-6.6.tar.xz 352476 BLAKE2B dfbc5f9a6ac63210d1ae305c2458cc44d38d44fcc272c9b0397a13a93e0aa0a09e3750e330a27dcf4dce796c6bd302c4d4c1fd91faab824a81949c31f1ed3504 SHA512 1e7eae3abe59e6af4bce0ebedd0a7ea84d1b0adc7693a0f03021c4096677096a022fdae521ac02413f9db46ee232b89dd2015a116845aa6ca7686fdda50a5b21
 DIST ethtool-6.7.tar.xz 352772 BLAKE2B 94a6fd8d29ff479eb894fe56bf991f522fff9af5a94c176d06be2819fe2520125cb48dbded229df1a9f5a0308aeaec503c55caf5d248eef87640c7f90f1132ec SHA512 07d13f9a8f980dab73c07e7c68179cfee272f53103c6dfbce1814b768e3313dc671a0cbefc63d4d53a616876bc1f96db8db2444617e4d58d741fae3acf0be524
+DIST ethtool-6.9.tar.xz 358640 BLAKE2B e04fa530084ad14abfea8c3802f272eb61eae9ee07aa2a12d16eeb77708b5ab021f1cdee10c24f83f77d65f2740ba5aceda99c21c47ef6cbcd65834af8334b00 SHA512 bc7e56a1a27a0679119491d6fce076e68374cf47a86fa4c0533851df0aa737cb9139920a9f3f3733deca672923d01bbb579f3d79bd17a2c6738f9f93aa469570
 EBUILD ethtool-6.6.ebuild 597 BLAKE2B 8b3815d7ae1c0299034324a1ed58f0279796941284df7d71a4c6238a30ebbe997c4250d538e4f7fcfb0e4e4e6ee2ae8bd3ec5d99526ec44bdc5b885ebd3e45b3 SHA512 3d4d11b7a5a392618b0214485baa852bad92dafba66b8f44c9abfd25052019b1d11840a842283344a8f83ae6806d83c0e8b33fdfdb0fb8418b0211528e1ba6dc
 EBUILD ethtool-6.7.ebuild 597 BLAKE2B 8b3815d7ae1c0299034324a1ed58f0279796941284df7d71a4c6238a30ebbe997c4250d538e4f7fcfb0e4e4e6ee2ae8bd3ec5d99526ec44bdc5b885ebd3e45b3 SHA512 3d4d11b7a5a392618b0214485baa852bad92dafba66b8f44c9abfd25052019b1d11840a842283344a8f83ae6806d83c0e8b33fdfdb0fb8418b0211528e1ba6dc
+EBUILD ethtool-6.9.ebuild 605 BLAKE2B bbd695bc614b44c12e38b08e026b1dbea5dc8aee84dccc9bafd56734ef1b2fc005a345b3fb5ea486828672c92738ca348372a246347934df80afd5475ca3dd22 SHA512 4f5ced2b28468b5c2d5833461bdc8746338d98355891a0f9a800aa214bfd075d193c1d1e44c550c8636121d069c444c770e66d4744e00a4ca32aa1edebaf922d
 MISC metadata.xml 993 BLAKE2B 92777546a5d0d904b319409448ce71991ddd4b89941888b19d2cb093b9f3227361fac1ef39535524a5bcb7b1cfd91c90fb4557d5501b46d44df64e647fb7d3aa SHA512 696f633f299189a01bc9ff309faac585a849323e0d471e1ddb7631bc917c83220844bae7ba1568a181b08029f4109bb2cf0c3063cee5f0d91705a04abe353793
diff --git a/sys-apps/ethtool/ethtool-6.9.ebuild b/sys-apps/ethtool/ethtool-6.9.ebuild
new file mode 100644
index 000000000000..e2e14f39f01b
--- /dev/null
+++ b/sys-apps/ethtool/ethtool-6.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
+HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
+SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+netlink"
+
+RDEPEND="netlink? ( net-libs/libmnl )"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/xz-utils"
+
+src_configure() {
+	econf $(use_enable netlink)
+}
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index b45dbfb43650..d00f2c4cf50b 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,5 +1,8 @@
 AUX findutils-4.9.0-dash-tests.patch 1196 BLAKE2B 36b35d9632e240882363de795b8b0fef236cdc95eda4d182f4bef2c166d0bd4897c5ec65ae62232cf1ff1ae99c5f8da3a00e570a1d61164f4f17d9146c974718 SHA512 9e3ecc4edeb4998849dbf1d5e053925809a7d4749ea4f19eb17a1794c98d7cb0b568151174083dbe278cbaf06cc13fcc13801b168a0e1f7812ebc54c6382e258
+DIST findutils-4.10.0.tar.xz 2240712 BLAKE2B 2eebdcb425c04170d17afb80e7270ba095bd691660d961dcfa731141633d3bb597d0b47d69ed17e891ef884a36d4c232885097e45b41d3d3ac79dbeae6ee2282 SHA512 b8b683d21cd26c6da4f41c56e83cadbda4780f8610a2bbd4b4e34bb1f339c3209721974b03e076d5eef0331fd876d947b398197aad37c29bbcc2e0405c641b34
+DIST findutils-4.10.0.tar.xz.sig 488 BLAKE2B fadd7dbf80a52965d6da641bda21ce00790623cf2c959ed03c1193a22c19f30417733511a739edcb1a0a97892a1257e0e88e32d872f94e71e3ade04776337d3c SHA512 a835153a0671309021be187bf78afee58d9682acb40545aaa9dd187f0ebdea0cfa5583bd03f363243633ea056ddb0a7a6603987ab5e34a608426cb4265ac6d8f
 DIST findutils-4.9.0.tar.xz 2046252 BLAKE2B 3ada8903fc552ad2e580a7b631a4b9d941935b3f4231029564c6f2b7b10ba6f2244e2de57f6d79268c5e0481a193f64edbbae637e7a51ae6f495e3eefabf52c9 SHA512 ba4844f4403de0148ad14b46a3dbefd5a721f6257c864bf41a6789b11705408524751c627420b15a52af95564d8e5b52f0978474f640a62ab86a41d20cf14be9
 DIST findutils-4.9.0.tar.xz.sig 488 BLAKE2B 7aab47ccb1351f08be03e781332b79d6778ff0d5d7959adf75fa8eab11325ee9971c89972338edfb58daac7f702891a1a5dd8379a703ccfa601e6b99db588197 SHA512 b8e0b5471242912a20b9e468fa27b7f27339af5f7be8918173105262dee0152183bf4cf516844d348b206a694e028490d5d3b190f3aed8c698ba5444941f8dfc
+EBUILD findutils-4.10.0.ebuild 2347 BLAKE2B 7a7c138f7ead545c3c9885f64aa703491539205ffe5d8a908f9d4819a67b9aeed3256fb9f6bd33c59c923c578c7b09219c03517cbc97a93784a2a9805944f84b SHA512 1b207e2c778e0d2f698d16182f5d9a72dac01316706e1d5ee7ece66de91eeae40b9ca5167daa0e866380fa68dc5162c5e73675dabda0bd02e2306f0f2a6b0d84
 EBUILD findutils-4.9.0-r2.ebuild 2396 BLAKE2B cbe790df642bd27f266854bd1b608fa8e65700147b64bcfb4677cca440020c2fa201da7ae6d88538533ac91a1b259eb026c05b5a833fa404d1353d3a0b8119c9 SHA512 cf654ce1aed5809b1a78f61487013929d0450a49efb4e245bcfb826f60400bb1714bbcf29c696113c01c304797f7072b0a928979eb5d6af81bf66545769387de
 MISC metadata.xml 383 BLAKE2B 19523d687c23d0f2e1edc4f9f9f183642d34717f29e0ddb0215c3fecabc4af9eb36443451044dd41e0b379c5b69d11ea60332f777c4ebc17dd8569483b88e3b2 SHA512 355aca11f02d0770f684a423dad09a107b28f4d4bcfdbede4b5dd80523803fe6f0d03dea23569c1d728a51c7545ee3ac041068492038ace55093d738f81d04d1
diff --git a/sys-apps/findutils/findutils-4.10.0.ebuild b/sys-apps/findutils/findutils-4.10.0.ebuild
new file mode 100644
index 000000000000..fd4180661649
--- /dev/null
+++ b/sys-apps/findutils/findutils-4.10.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/findutils.asc
+inherit flag-o-matic python-any-r1 verify-sig
+
+DESCRIPTION="GNU utilities for finding files"
+HOMEPAGE="https://www.gnu.org/software/findutils/"
+SRC_URI="
+	mirror://gnu/${PN}/${P}.tar.xz
+	verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="nls selinux static test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	selinux? ( sys-libs/libselinux )
+	nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	test? (
+		${PYTHON_DEPS}
+		dev-util/dejagnu
+	)
+	verify-sig? ( sec-keys/openpgp-keys-findutils )
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Don't build or install locate because it conflicts with mlocate,
+	# which is a secure version of locate. See bug #18729.
+	sed \
+		-e '/^SUBDIRS/s@locate@@' \
+		-e '/^built_programs/s@ frcode locate updatedb@@' \
+		-i Makefile.in || die
+
+	default
+}
+
+src_configure() {
+	if use static; then
+		append-flags -pthread
+		append-ldflags -static
+	fi
+
+	append-lfs-flags
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00050.html
+		# https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00051.html
+		append-cppflags '-D__nonnull\(X\)='
+	fi
+
+	local myeconfargs=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR}"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		$(use_enable nls)
+		$(use_with selinux)
+		--libexecdir='$(libdir)'/find
+		# rename to gfind, gxargs for better BSD compatibility
+		--program-prefix=g
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# We don't build locate, but the docs want a file in there.
+	emake -C locate dblocation.texi
+	default
+}
+
+src_test() {
+	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict /
+	default
+}
+
+src_install() {
+	default
+
+	# symlink to the standard names
+	dosym gfind /usr/bin/find
+	dosym gxargs /usr/bin/xargs
+	dosym gfind.1 /usr/share/man/man1/find.1
+	dosym gxargs.1 /usr/share/man/man1/xargs.1
+}
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 5555ccda3448..8ddbbb6c1333 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -4,8 +4,6 @@ AUX profile_display.local 158 BLAKE2B 7bb73bfa3d1a6556f9e4840e425e0bb2ee6a1e9510
 AUX profile_patch.local 198 BLAKE2B 6a84eca54c8fa5429b171707d6d2b7617c918798f40a1ea26fd1c6778a3688aa1db2be9d74025b7b8b863969c94c22de92a610d2b872b37ba216377f50f0ceae SHA512 86829f6b4867564447d06c73119a38e4ae7b5a386253229d5d0603398b9ed4ca64714221fa8aee8a9660644c3c38d762386a7a5a161fb717e6b7d7df723aa9ad
 AUX profile_pdftotext.local 132 BLAKE2B 2c98ecf386cdceae4cbaf4e3623187c66ff81540d86f978467a6a0106d57a0f41f7626f1049602fee8b7545fa413ed6ca8e21e1fb1448a374b8d80e6ae72451b SHA512 c0121f1ba4db0a737acdd250834ccd73fcd441b5d7f8d5740f75230edbb10bd6bb038dd09772ba21cb24cf4224a474749a2e0f3d0e9567b4e207f4adf67c19d0
 AUX profile_wget.local 128 BLAKE2B d2069517fce414faec2b23f8704fe15683a956af210e6e39321ca9f65bde939c71a7980506fdd3b01a6b15fb6733ebb013c684a63589839c60c53616a52ca5b6 SHA512 ef0b97b11fac742464b6520c6e6293017519b84c137c4aa60976b53b3d072bc9a69588267ac0a79c9647cee1e802fb0cd0d28e1647778e30473518415ce4d699
-DIST firejail-0.9.70.tar.xz 485096 BLAKE2B d5164ba5ee08e80415a84999e4152f1f9c897f50def669731098126cec117aed3cf4b21603aeb13ccbdb1bffa9d48de69dcb19fe7135691e891b9b83f48a5ca1 SHA512 a790ccb711da6c3e52677011d7eb38c482ffb5066498d4586018671ab4ee533e02edb31fda872e0647fd27c00014b04305eafcb56f1f1b07f470aa4fb701cbe5
 DIST firejail-0.9.72.tar.xz 503192 BLAKE2B 3d57b345476cb62399859622c88f5d6c22842da5894045c09bc7d84229ec2a01c494e4e9393b6fba6c668f73c6b7046f9a014a315baa5bc56d1479b9cad178a7 SHA512 846fa5caf6e68c669f76a07d6321ed365bf3c45f7992e8be3784ed99ef508ea8dffc5d6cc5da75eeb37964ad358d61b7959e8590051950951de8ca904d8a49de
-EBUILD firejail-0.9.70.ebuild 3046 BLAKE2B 48f9fc8719e87d123dbb65b2dcc7856c4a6fd5f33c309cef18e4d643b94089fb8af97bd9bf214722fa1255853477839495b71d9dedb7ea7ab5ae66ca702f31cb SHA512 28a1c279e453a27b57a2759f9624bbfbb6d9c372bba58b4fb33a2a1e440dbc3b97b23449bffee9102d869c881f2743930c68fcf45335103017b7439c2cec37a8
 EBUILD firejail-0.9.72.ebuild 3567 BLAKE2B 256542643d8cae9c808bb56dd8513ef53cdeacc25cdbf6cee6ef6d3a26fe6bae4cdbcbfb7a146cdf4e40bd99729cd4dfb349d584f77bb8357372f16c14ad9ce8 SHA512 80e279a187cbf556cae30db5104494b2f43d614de89f52c7fb9140056cc72db7885b1b5443101eeec81813b02df16d25f722528436b9d82b063fd38ec692697a
 MISC metadata.xml 1674 BLAKE2B ccb5e94f6e55a8d1864cb6a1d15239ed0a5dd76173a9c20c1162bb55f1ca97e48f1c09902d429bd1086c7b1b014a146c9eb27f0115941e6f7a44cf8aff690e27 SHA512 e8b6c84d5413f6dd33cfe60c111e51a59c89dc95f874c02e38451639ebd05646e49421852cedeef1f101309d73f2aabf6dea1da664f1a6596fce00c0bb2fffae
diff --git a/sys-apps/firejail/firejail-0.9.70.ebuild b/sys-apps/firejail/firejail-0.9.70.ebuild
deleted file mode 100644
index a35fe516d656..000000000000
--- a/sys-apps/firejail/firejail-0.9.70.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit toolchain-funcs python-single-r1 linux-info
-
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/netblue30/firejail.git"
-	EGIT_BRANCH="master"
-fi
-
-DESCRIPTION="Security sandbox for any type of processes"
-HOMEPAGE="https://firejail.wordpress.com/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home test +userns X"
-# Needs a lot of work to function within sandbox/portage
-# bug #769731
-RESTRICT="test"
-
-RDEPEND="!sys-apps/firejail-lts
-	apparmor? ( sys-libs/libapparmor )
-	contrib? ( ${PYTHON_DEPS} )
-	dbusproxy? ( sys-apps/xdg-dbus-proxy )"
-
-DEPEND="${RDEPEND}
-	sys-libs/libseccomp
-	test? ( dev-tcltk/expect )"
-
-REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-envlimits.patch"
-	"${FILESDIR}/${P}-firecfg.config.patch"
-	)
-
-pkg_setup() {
-	CONFIG_CHECK="~SQUASHFS"
-	local ERROR_SQUASHFS="CONFIG_SQUASHFS: required for firejail --appimage mode"
-	check_extra_config
-	use contrib && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	find -type f -name Makefile.in -exec sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' {} + || die
-
-	sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
-
-	# fix up hardcoded paths to templates and docs
-	local files=$(grep -E -l -r '/usr/share/doc/firejail([^-]|$)' ./RELNOTES ./src/man/ ./etc/profile*/ ./test/ || die)
-	for file in ${files[@]} ; do
-		sed -i -r -e "s:/usr/share/doc/firejail([^-]|\$):/usr/share/doc/${PF}\1:" "${file}" || die
-	done
-
-	# remove compression of man pages
-	sed -i -r -e '/rm -f \$\$man.gz; \\/d; /gzip -9n \$\$man; \\/d; s|\*\.([[:digit:]])\) install -m 0644 \$\$man\.gz|\*\.\1\) install -m 0644 \$\$man|g' Makefile.in || die
-
-	if use contrib; then
-		python_fix_shebang -f contrib/*.py
-	fi
-}
-
-src_configure() {
-	econf \
-		--disable-firetunnel \
-		--enable-suid \
-		$(use_enable apparmor) \
-		$(use_enable chroot) \
-		$(use_enable dbusproxy) \
-		$(use_enable file-transfer) \
-		$(use_enable globalcfg) \
-		$(use_enable network) \
-		$(use_enable private-home) \
-		$(use_enable userns) \
-		$(use_enable X x11)
-
-	cat > 99firejail <<-EOF || die
-	SANDBOX_WRITE="/run/firejail"
-	EOF
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	default
-
-	# Gentoo-specific profile customizations
-	insinto /etc/${PN}
-	local profile_local
-	for profile_local in "${FILESDIR}"/profile_*local ; do
-		newins "${profile_local}" "${profile_local/\/*profile_/}"
-	done
-
-	# Prevent sandbox violations when toolchain is firejailed
-	insinto /etc/sandbox.d
-	doins 99firejail
-
-	rm "${ED}"/usr/share/doc/${PF}/COPYING || die
-
-	if use contrib; then
-		python_scriptinto /usr/$(get_libdir)/firejail
-		python_doscript contrib/*.py
-		insinto /usr/$(get_libdir)/firejail
-		dobin contrib/*.sh
-	fi
-}
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 2434df469a50..67c30c6213f8 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,9 +1,7 @@
 AUX conf.d-pciparm 988 BLAKE2B c51b826806c58411939d8987e103cba5775806abcbf12a9320cdba2d410dde4f2b3198b4e07d3341b2b7fcafcfd6cafea648909bdaa4976703c764d5d4a0e312 SHA512 7c3513a9112318736907f4a1f3e94910d59752d8f51cf4f9f8ccd33b563250aca17a507e0937507bd9352d12a2b9a47e7419306908990b21a3460e6527dab6a4
 AUX init.d-pciparm 1758 BLAKE2B a9dd930da942c73d7a150938b2b58543f517542c4c675334cca8f9eb02b83dad456e36ae1bf77ed8fcc0eac52e0dc638f19a41682fa3e1d3623011d09301945b SHA512 c5a527236039edf29f6876d3b07909045dd04e40d863d68014dd96cc021b7b61356470e67541b5b68487d996a299b60b3da46272259f9d0724ea1392e6243646
 DIST pciutils-3.10.0.tar.gz 931711 BLAKE2B 2e1255eb5508c9d1339f5bc772c2592a03cae4d8d097e8939748c9bb5d5d949be53d705d1b7d903f7ea88b2abeea91e39de16e39d2f46f0a1f62f8a9e32c6faa SHA512 3da1af4af8b0fa3cf4d3f06095524e25dc292182beec10aa2c16c5c6ba751fe469d0e7f54e43413b6f3f5bcdbd1fba3c66df1d8e39d2e1962ae36a2d9c06238e
-DIST pciutils-3.11.1.tar.gz 660457 BLAKE2B 447d0e3fa209d2d27a0310a5824a75b543b539c459caed23e9218f4ff3f9a3c2a99c65dd5ddf92a56c2b880ecfaeff6f3edc458c3e5973a1a4937325740915ac SHA512 6bbb248364831a384a2f521d7300cc53b046ce3765c3f7aca08c9e839174b02687543ee697b8ffc24258bcd39ac625d1ce53d6ca02fdc718eea86a50c95a33de
 DIST pciutils-3.12.0.tar.gz 668358 BLAKE2B 6d57b0654a26e959d2a953a102fd616ba0a0a183ec6d40f65a1274ad33330df9c81b95d4b2274edc240cbcf576ce93a0b61252bae0b6348a29df659b3fc219eb SHA512 b1efd3e24efad4f80e1a942d23d6ea12acec9642714e47d24bff7f7c53ff475b0252c6f75c0053b7ec64635037e72b150b3e313229b36479dc0cbf96902096c5
 EBUILD pciutils-3.10.0.ebuild 4905 BLAKE2B fc998bbc04dd08d1707890bafc62deaa9a282640a7ca946b37e24841b2bf00205d4ee18678786a3616293fa211a1ada48da41bd564e0d6716cd5c7ab2edf2fe0 SHA512 5435ab9fef31732c00f278c4ba19501f99cb13aa2ab84974bef5571798121747c2a9cf68c1d20b4d4a0ea2db4f93b842f7149ac46ab3ed615a5793209c97f297
-EBUILD pciutils-3.11.1.ebuild 4913 BLAKE2B 301520e077afbd9406e5f330b1a3013d8e89cacaa8f72757da44935db7c9b532cc732e4131366db4b79972df85ecc5df0219c7a46f7e0f39796baa99499421e4 SHA512 8e1d393c8c32b3dde40fd0f80f1a99284cc24c8f4ed1a80c34d7f0fff830947ee7e04328d1ad47bbf9ded42f57bd4d831d846af0d27c23c2821ba10b0d6c4cbe
 EBUILD pciutils-3.12.0.ebuild 4906 BLAKE2B 7f34d5ff16c89d7fe6112c252b0db3d6afa919d037d82709ef8fc1e4decd17e1c813653baa873dc3d195bf543ae2198ccf8229b5c3143c7c846cda26ae00682e SHA512 ea32c95dbffc4fe0d5a0e04a482355b5e59ba78f2c0ee3a190e99b7d384fed6673433b6b7cd05bbba370b54ada69d3fd0051b8bd924da3a781fa1669ce96777a
 MISC metadata.xml 616 BLAKE2B 0aefbd7995f4bf549cba3e9c60066675efb8dc8e4d38e320c8cb28f7f6a275527e90d2526248c57fd34d09125693e3f185f51c05d0ae10fd8a61d058d4f8a9d0 SHA512 5f44a15a2a18a40ac7a46a5c1dfed741082e48321d5ee3f53bebb6b12e310ea05070e03853cf15655ef800a768d49515f174e3a73ca923177ce0be3963154a59
diff --git a/sys-apps/pciutils/pciutils-3.11.1.ebuild b/sys-apps/pciutils/pciutils-3.11.1.ebuild
deleted file mode 100644
index dd3c7a05627e..000000000000
--- a/sys-apps/pciutils/pciutils-3.11.1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs multilib-minimal flag-o-matic
-
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
-SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="dns +kmod static-libs +udev zlib"
-REQUIRED_USE="static-libs? ( !udev )"
-
-# Have the sub-libs in RDEPEND with [static-libs] since, logically,
-# our libpci.a depends on libz.a/etc... at runtime.
-LIB_DEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )"
-DEPEND="
-	kmod? ( sys-apps/kmod )
-	udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )
-	static-libs? ( ${LIB_DEPEND} )
-	!static-libs? ( ${LIB_DEPEND//static-libs([+-]),} )
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/hwdata
-"
-# See bug #847133 re binutils check
-BDEPEND="
-	|| ( >=sys-devel/binutils-2.37:* sys-devel/lld sys-devel/native-cctools )
-	kmod? ( virtual/pkgconfig )
-"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
-
-switch_config() {
-	[[ $# -ne 2 ]] && return 1
-	local opt=$1 val=$2
-
-	sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
-	return 0
-}
-
-check_binutils_version() {
-	if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && ! tc-ld-is-gold && ! tc-ld-is-lld ; then
-		# Okay, hopefully it's Binutils' bfd.
-		# bug #847133
-
-		# Convert this:
-		# ```
-		# GNU ld (Gentoo 2.38 p4) 2.38
-		# Copyright (C) 2022 Free Software Foundation, Inc.
-		# This program is free software; you may redistribute it under the terms of
-		# the GNU General Public License version 3 or (at your option) a later version.
-		# This program has absolutely no warranty.
-		# ```
-		#
-		# into...
-		# ```
-		# 2.38
-		# ```
-		local ver=$($(tc-getLD) --version 2>&1 | head -n 1 | rev | cut -d' ' -f1 | rev)
-
-		if ! [[ ${ver} =~ [0-9].[0-9][0-9] ]] ; then
-			# Skip if unrecognised format so we don't pass something
-			# odd into ver_cut.
-			return
-		fi
-
-		ver_major=$(ver_cut 1 "${ver}")
-		ver_minor=$(ver_cut 2 "${ver}")
-
-		# We use 2.37 here, not 2.35, as https://github.com/pciutils/pciutils/issues/98 mentions
-		# because we've had other miscompiles with older Binutils (not just build failures!)
-		# and we don't want people running any unsupported versions of Binutils. An example
-		# of this is where glibc is completely broken with old binutils: bug #802036. It's
-		# just not sustainable to support.
-		if [[ ${ver_major} -eq 2 && ${ver_minor} -lt 37 ]] ; then
-			eerror "Old version of binutils activated! ${P} cannot be built with an old version."
-			eerror "Please follow these steps:"
-			eerror "1. Select a newer binutils (>= 2.37) using binutils-config"
-			eerror " (If no such version is installed, run emerge -v1 sys-devel/binutils)"
-			eerror "2. Run: . /etc/profile"
-			eerror "3. Try emerging again with: emerge -v1 ${CATEGORY}/${P}"
-			eerror "4. Complete your world upgrade if you were performing one."
-			eerror "5. Perform a depclean (emerge -acv)"
-			eerror "\tYou MUST depclean after every world upgrade in future!"
-			die "Old binutils found! Change to a newer ld using binutils-config (bug #847133)."
-		fi
-	fi
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_binutils_version
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && check_binutils_version
-}
-
-src_prepare() {
-	default
-
-	if use static-libs ; then
-		cp -pPR "${S}" "${S}.static" || die
-		mv "${S}.static" "${S}/static" || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# bug #640836, bug #852929
-	# Still broken in 3.10.0, see https://github.com/pciutils/pciutils/pull/144.
-	filter-lto
-
-	# bug #471102
-	append-lfs-flags
-}
-
-pemake() {
-	emake \
-		HOST="${CHOST}" \
-		CROSS_COMPILE="${CHOST}-" \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		RANLIB="$(tc-getRANLIB)" \
-		DNS=$(usex dns) \
-		IDSDIR='$(SHAREDIR)/hwdata' \
-		MANDIR='$(SHAREDIR)/man' \
-		PREFIX="${EPREFIX}/usr" \
-		SHARED="yes" \
-		STRIP="" \
-		ZLIB=$(usex zlib) \
-		PCI_COMPRESSED_IDS=0 \
-		PCI_IDS=pci.ids \
-		LIBDIR="\${PREFIX}/$(get_libdir)" \
-		LIBKMOD=$(multilib_native_usex kmod) \
-		HWDB=$(usex udev) \
-		"$@"
-}
-
-multilib_src_compile() {
-	pemake OPT="${CFLAGS}" all
-
-	if use static-libs ; then
-		pemake \
-			-C "${BUILD_DIR}"/static \
-			OPT="${CFLAGS}" \
-			SHARED="no" \
-			lib/libpci.a
-	fi
-}
-
-multilib_src_install() {
-	pemake DESTDIR="${D}" install install-lib
-
-	use static-libs && dolib.a "${BUILD_DIR}"/static/lib/libpci.a
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog README TODO
-
-	rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/man/man8/update-pciids.8* || die
-	rm -r "${ED}"/usr/share/hwdata || die
-
-	newinitd "${FILESDIR}"/init.d-pciparm pciparm
-	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
-}
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 237d044c6265..f863b99ed629 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -1,11 +1,9 @@
-AUX 99-pcscd-hotplug-r1.rules 363 BLAKE2B 65049122751de2d50f60449cebaa948ce276680d969ef1a13700a3fc7577c90e24b96b69f2285389361aeb6dfbdd7f0eb49faa953855ba39473270aa530c395f SHA512 45c1d50175844b4f46d0a5a15855bfb929d4848f9570e92c3327a95fce7aeb11fda7cecd1c24338aed96b696134baa1715ab59ac578af7c11e43bbc73b27a990
+AUX 99-pcscd-hotplug-r2.rules 377 BLAKE2B a7dcc09ec990eb7022d0622d4d480e39f72b754bc332ad388d8e73ef800d387ff5ad5f309d8d47baf8f9b5c178bc2c2dd8ad3a1f45536157f260e8a9a57decda SHA512 ca5435113cfebe64f05f05e16a53e7d7a3a733c765a69ee9d7d74a0185aa38acd9378e2c2c817b04e5e3c1f5a0dff8761935d55ed8d6768a080c6e7e2058ab2e
 AUX pcsc-lite-1.8.11-polkit-pcscd.patch 744 BLAKE2B b9a846a989d1708a30bb62e93ab19fbf5cfe4c2c601d435b53a8933117d919a4fbac8835e68b895507840a25a9aab85e35f6b4c2e7461ec3c7893d483e12f759 SHA512 4f8b774ec888d51c0ad82431cb9d041be6b69af0bfa2a535c6b7e47afb0056147c08ab9265d7da2259a74347ceba9dba320ad0892d3a25797efc64b79113f4a5
 AUX pcsc-lite-1.9.8-systemd-user.patch 415 BLAKE2B dd29a0965167cde394e95bb751f6d193935234f15b2eb6ab03a1c70fb5c7fcf43d2c2b81be9c8c9e29d87affca68d1b236ea1db3fbb1ca7ddcd63e4e3da4c35c SHA512 8c1fde18596e1642aef08adb6a23be36930f0f1a6946c6e27b283cff6556afd75f54e6995ca0c62cbf86aa56157961637981cf046a04d17ede93518408ffe65a
 AUX pcscd-init.7 408 BLAKE2B 54e4995a169b7f816b0de9b409ae94a8328e792b50872d583988cc87ad20b5c2d20559f3702dc4525dcc46c4afabf817c1e76f4a080ca277f9ab01ebcf67441f SHA512 24fbd0fe2847f6c7bb961e4e0d9fa5197d408971fc33fa7652893ce9dbba958d19b02be7688afd4e9617520f93b6544af74968d6fcc3b31ad73b3ac585e87500
 AUX pcscd-udev 330 BLAKE2B 50e99953aec238fe98c6aee5219d3978b44d37c90ce74c9cb8e19b37c8677001e9b1b3701df8246bf051c6cf8b5c971f86bf1f580bfcbff270b8937328ca887d SHA512 06b672135fda9f83af4f030ff8078f8e1194ced529334c17c1a93f81ee9a5d4448bcea5ffec398f01d957a6607fbde7f69fbc23d727bb3ffad48a305cefe5c26
 AUX pcscd.conf 32 BLAKE2B 2407e00c654d7e259ebf69ab420800f5605cb3ead23eb4aa07317928c38b6328eae2e566fab84c8844fb80e8a165cd32982fee753498b20c7a750f52fbb1f995 SHA512 ae27cdab8a60201639b9d9aca2d7f760146a5c5238878a0ebb562740385bf58f04bbc37a19cd1a2c8c69ee463f10beecc6531dde733cb6a6d4b06816f54b1569
-DIST pcsc-lite-2.0.0.tar.bz2 799011 BLAKE2B d93fffebbe3daf389fcd8195c9fb3d76db64dbb98ac9c7ecd08338331389298e710ca71187cb73165868b0b5e66cb9735b60e22d508db1c1a81e04555103948a SHA512 4b34628d3269ae1859f19d2ab7eb74a76a55f3d76fbc9e4e420a081a065b1d0d7b98680552c7208f3265c684bed844afc6be1c2e5f103ad916ce7f38b52ee68c
 DIST pcsc-lite-2.0.1.tar.bz2 815103 BLAKE2B a9eea4a4da1a78fc22797b17c128889b2f7caf8c4aa02dd77f4ac79e4ec458fb0162578b5422552545cd39303750d5396f3687f8cfee7603fad8d60cb54ee1e8 SHA512 af007f00f43e8d897710580f6f27814c9e7d3ca489ff01edf2e3b979e46267915aa04d9c15f225a420fa681de936e42a1d4779d962717cf9a9f4a3d1ca31502b
-EBUILD pcsc-lite-2.0.0.ebuild 3348 BLAKE2B e631a5f8290d238b99c12846c824c408f6f03e0326589d9c8485c59829d1aa7512e806b6760db8b23ffe113ba10dceb099f2b5454e536394c960ddc724a723e2 SHA512 a62dd910e493483c30d6b9c65b627aecf3e3ec1979a41e1c2696f28296eef80bdad1b25b6d7473b6bd498c0af442e562d050b476c9c756595de4039389035ed2
-EBUILD pcsc-lite-2.0.1.ebuild 3348 BLAKE2B ab4c779003df5c234b83dddf62ec045d032faef917427406064765c46f21a403412c12cc60a827cc67204084e741375f4b66183a2e9bd36f0713726b5149bc74 SHA512 e421f379dfcfc7353d1bcdc9f65d4705d838d73b4291cbafc5a5829b19fc08c32d8b176ea3ac8019e4e62420f4347c096ac78ff112099aa52fa799d4b552f61a
+EBUILD pcsc-lite-2.0.1-r1.ebuild 3348 BLAKE2B 7383ca56e9a93ff11896c7610eb2ce8bdbac12154a9ed34bd0bcf10440c1ac96b992559b748f97e7209f3660af7c1170c4d9aca96c03facff867415360562548 SHA512 c3d29ebad8e80d54df5339b2860c0e560e8a5962abc16b8cbb28d6e6d6948eedb156171325e34cb04d4df3573515806f51ab7c0ba0ce3ee30076580e819951f4
 MISC metadata.xml 1147 BLAKE2B c89b7f5443b81af35a0debe239b95ffa3dea06c4e86c1cb3bfe50dfc81e49d32939ae2eaaabcc5b4c5947c69c8ae90ce278efafc324ff6ab10a9ed514fa0a8b3 SHA512 96aea50c57df7bf05d5e05d7dd19f985193638592526a1357680f3e3489c0680b38f2f732714a0726097e40503bf1573b5458d4917fbcf1cbfeb56953d05293f
diff --git a/sys-apps/pcsc-lite/files/99-pcscd-hotplug-r1.rules b/sys-apps/pcsc-lite/files/99-pcscd-hotplug-r2.rules
index fc612d5e25f3..218417932aa2 100644
--- a/sys-apps/pcsc-lite/files/99-pcscd-hotplug-r1.rules
+++ b/sys-apps/pcsc-lite/files/99-pcscd-hotplug-r2.rules
@@ -1,6 +1,6 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # We add this here so that it runs after ccid's and ifd-gempc's rules;
 # if we just added a pcscd-owned device, we hotplug the pcscd service.
-ACTION=="add", ENV{PCSCD}=="1", GROUP="pcscd", TAG+="systemd", ENV{SYSTEMD_WANTS}+="pcscd.service", RUN+="pcscd.sh"
+ACTION=="add", ENV{ID_SMARTCARD_READER}=="1", GROUP="pcscd", TAG+="systemd", ENV{SYSTEMD_WANTS}+="pcscd.service", RUN+="pcscd.sh"
diff --git a/sys-apps/pcsc-lite/pcsc-lite-2.0.0.ebuild b/sys-apps/pcsc-lite/pcsc-lite-2.0.0.ebuild
deleted file mode 100644
index 661385f197ba..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-2.0.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit python-single-r1 systemd tmpfiles udev multilib-minimal
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
-SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
-
-# GPL-2 is there for the init script; everything else comes from
-# upstream.
-LICENSE="BSD ISC MIT GPL-3+ GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-# This is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="doc embedded libusb policykit selinux systemd +udev"
-REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
-
-# No dependencies need the MULTILIB_DEPS because the libraries are actually
-# standalone, the deps are only needed for the daemon itself.
-DEPEND="
-	libusb? ( virtual/libusb:1 )
-	udev? ( virtual/libudev:= )
-	policykit? ( >=sys-auth/polkit-0.111 )
-	acct-group/openct
-	acct-group/pcscd
-	acct-user/pcscd
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-pcscd )"
-BDEPEND="
-	app-alternatives/lex
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
-	"${FILESDIR}"/${PN}-1.9.8-systemd-user.patch
-)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-maintainer-mode \
-		--disable-strict \
-		--enable-usbdropdir="${EPREFIX}"/usr/$(get_libdir)/readers/usb \
-		--enable-ipcdir=/run/pcscd \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(multilib_native_use_enable doc documentation) \
-		$(multilib_native_use_enable embedded) \
-		$(multilib_native_use_enable systemd libsystemd) \
-		$(multilib_native_use_enable udev libudev) \
-		$(multilib_native_use_enable libusb) \
-		$(multilib_native_use_enable policykit polkit)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc HELP SECURITY
-
-	newinitd "${FILESDIR}"/pcscd-init.7 pcscd
-	dotmpfiles "${FILESDIR}"/pcscd.conf
-
-	if use udev; then
-		exeinto "$(get_udevdir)"
-		newexe "${FILESDIR}"/pcscd-udev pcscd.sh
-
-		insinto "$(get_udevdir)"/rules.d
-		newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
-	fi
-
-	python_fix_shebang "${ED}"/usr/bin/pcsc-spy
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
-	elog "the pcscd group, to avoid running as root."
-	elog
-	elog "This also means you need the newest drivers available so that the"
-	elog "devices get the proper owner."
-	elog
-	elog "Furthermore, a conf.d file is no longer installed by default, as"
-	elog "the default configuration does not require one. If you need to"
-	elog "pass further options to pcscd, create a file and set the"
-	elog "EXTRA_OPTS variable."
-	elog
-
-	if use udev; then
-		elog "Hotplug support is provided by udev rules."
-		elog "When using OpenRC you additionally need to tell it to hotplug"
-		elog "pcscd by setting this variable in /etc/rc.conf:"
-		elog
-		elog "    rc_hotplug=\"pcscd\""
-	fi
-
-	tmpfiles_process pcscd.conf
-
-	use udev && udev_reload
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-2.0.1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-2.0.1-r1.ebuild
index 5d5823a7adbb..a3a1b872c2cd 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-2.0.1.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-2.0.1-r1.ebuild
@@ -70,7 +70,7 @@ multilib_src_install_all() {
 		newexe "${FILESDIR}"/pcscd-udev pcscd.sh
 
 		insinto "$(get_udevdir)"/rules.d
-		newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
+		newins "${FILESDIR}"/99-pcscd-hotplug-r2.rules 99-pcscd-hotplug.rules
 	fi
 
 	python_fix_shebang "${ED}"/usr/bin/pcsc-spy
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index e2094beb9c2c..ddb44ab28303 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -11,8 +11,8 @@ DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bb
 DIST systemd-stable-254.12.tar.gz 14529517 BLAKE2B ed6e4a78363930840e505c4bd789d1d44c238f30d3c0768d435e1cacb43ac3ab07e0dc9085546b4142152bbb4ceb4e2c0a9560e74e1a2b8c09fc885620695e73 SHA512 fa3679915392e641bed73ccb48f5def386ab13ba5ff7efdac952214193c3311543bec4c4370d6880f9599f63e377506b343805c3c56b7dde7eb5e3bbc0dc7a87
 DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270e1f97ba78f8280f45100b1b5b33c3531cf79587b596ccbbe594f1e623d918c1fdf19f2231d677e27b5421f1852fbe3225b3 SHA512 852cbc992128dc3ab6ded4215c2540fa3c0b7c7ad98e54036f3981d77a2162f5393ee50960773419133e0d584844af329d3726f45829a56c00b1827e33edf3e1
 DIST systemd-stable-255.4.tar.gz 14952427 BLAKE2B 27f5080f83a9e870fbe8e3ebcb500a63c42022f1f96f26f35c76eeeea85dab691291c31ee716cab330b76df5e576910a6a82f51267eff4f766b1d4c304d815c9 SHA512 8a2bde11a55f7f788ba7751789a5e9be6ce9634e88d54e49f6e832c4c49020c6cacaf2a610fe26f92998b0cbf43c6c2150a96b2c0953d23261009f57d71ea979
-EBUILD systemd-utils-254.10-r1.ebuild 13329 BLAKE2B a86c581f5fb3af69a590a994169aca5ded7d9cc34c07542ca86292991db5d39a023bd859c9b7bc1dfd9f8fde95b50348cd959c9e6bff08e94675a8753e16483d SHA512 b3f8c8d3c0647ee8701d7a6ebc921a0760540d8e38410fd6e8d257b6b6f11ceb72e1dc12e55df009a52f0d4e15ee7302a1d309bedef4da2a770ed625d0fc60e0
-EBUILD systemd-utils-254.12.ebuild 13337 BLAKE2B ca4405757ee54acc143f1f2af2c974cfd90c36a11681d62ee07f3da0c82972aa239dbb280c9bb179022f2da9628e1a37bbae5e0a9c186534e1bf0c937fed4502 SHA512 bcb56e7d0ca145789f7b293155937e7b7d7e3cbf4416b592aafac8fe64641014947606ac950102c6dc0c9371dbb080e4d0603fd915177127a57dcfa5559dc7cd
-EBUILD systemd-utils-254.13.ebuild 13337 BLAKE2B ca4405757ee54acc143f1f2af2c974cfd90c36a11681d62ee07f3da0c82972aa239dbb280c9bb179022f2da9628e1a37bbae5e0a9c186534e1bf0c937fed4502 SHA512 bcb56e7d0ca145789f7b293155937e7b7d7e3cbf4416b592aafac8fe64641014947606ac950102c6dc0c9371dbb080e4d0603fd915177127a57dcfa5559dc7cd
-EBUILD systemd-utils-255.4.ebuild 13753 BLAKE2B 96ae2f52c47ff4a22d5fe9c8d42bff6e70c00656c50cefc6353e9c96cfe58977b05c589567ef334f591ef0ee8459b44472c9ff06917227a5e563f0eba72d4540 SHA512 e2242b212c0f79cc2a06b0491fa1903b4381b2436dd5e8e844b8be9f39d3c01b8f351f6c20adb6e5d96f0cf1b5bd842e0751b93e44c9745bb637788be0dbd513
+EBUILD systemd-utils-254.10-r1.ebuild 13317 BLAKE2B b7694b1f3d640819a80c299ab825ebfc8b4c37d0b6b4f5dbb507af8b31534ffdcfd572132b3062ed93a146bb2173b4e04cebf0e09f9190025903d9ad11a02259 SHA512 c2bbf5f8b8b009386ae680b352c3b1ae3e16e445d21ecc84540d68ac4375b24bfbca9ffd3cc1d633c92a740b2c25b092c22221e527f64239872f122525a99441
+EBUILD systemd-utils-254.12.ebuild 13325 BLAKE2B d2653bcb36e4a3af84ea28c8ddd1fb5fbb6015a297d519827f3f2895366fb7e37217830470eb2e352ca47d197fee067fe075774c23946322afbcc9a59caf4969 SHA512 74de09c449345a8d3817a5b87a99ad66a0caec148e365da13b992cb0d2cd94426fc5db535b84b483361a0236e89a26814ae8cbac9972b6b721bc7aab855f67d6
+EBUILD systemd-utils-254.13.ebuild 13325 BLAKE2B d2653bcb36e4a3af84ea28c8ddd1fb5fbb6015a297d519827f3f2895366fb7e37217830470eb2e352ca47d197fee067fe075774c23946322afbcc9a59caf4969 SHA512 74de09c449345a8d3817a5b87a99ad66a0caec148e365da13b992cb0d2cd94426fc5db535b84b483361a0236e89a26814ae8cbac9972b6b721bc7aab855f67d6
+EBUILD systemd-utils-255.4.ebuild 13741 BLAKE2B b4ae33f57c5edcbba98c274ac65af9314f3eb10bc994377bf30bfff36acd7fb88cde52acd1e1e70f496852b98cf5890d6fad9cfb4d555074eb154e95d8a57334 SHA512 dc4468c9265b1c501fc708529ffcf770843e72b3a65545ff9618fb95712fad1d3fc953a2c03581e00e9ca7d95f88c9f4d1e4c89bb0814cf77988f34beab24222
 MISC metadata.xml 888 BLAKE2B b799e1d62a1208dbbec1a1cfb47592b069d5c79cb18efffef922c72b0d61e30938d26c6f4e0d3951f9c327601dd71de14062dad0a47e6b84a61b1a8b125f1a6b SHA512 6debd964f9c127ba4332e0c0b86e506d3cf10cbe3cd45442bf7955b16e790a9eccdd928d473b3722b11b4a75d34fe5bb91f4867a5dc92e786ba73d9ec3f54712
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
index ca3697269cd2..b906b6110034 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
@@ -375,7 +375,7 @@ multilib_src_compile() {
 	fi
 	if use udev; then
 		targets+=(
-			udev:shared_library
+			libudev
 			src/libudev/libudev.pc
 		)
 		if use test; then
diff --git a/sys-apps/systemd-utils/systemd-utils-254.12.ebuild b/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
index 9ba529076182..4e14021f3732 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
@@ -375,7 +375,7 @@ multilib_src_compile() {
 	fi
 	if use udev; then
 		targets+=(
-			udev:shared_library
+			libudev
 			src/libudev/libudev.pc
 		)
 		if use test; then
diff --git a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
index 9ba529076182..4e14021f3732 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
@@ -375,7 +375,7 @@ multilib_src_compile() {
 	fi
 	if use udev; then
 		targets+=(
-			udev:shared_library
+			libudev
 			src/libudev/libudev.pc
 		)
 		if use test; then
diff --git a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
index 4c64afbd80c1..ea1032f738dc 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
@@ -384,7 +384,7 @@ multilib_src_compile() {
 	fi
 	if use udev; then
 		targets+=(
-			udev:shared_library
+			libudev
 			src/libudev/libudev.pc
 		)
 		if use test; then
diff --git a/sys-apps/xdg-desktop-portal-xapp/Manifest b/sys-apps/xdg-desktop-portal-xapp/Manifest
index 21e984264ffa..3eb32e090176 100644
--- a/sys-apps/xdg-desktop-portal-xapp/Manifest
+++ b/sys-apps/xdg-desktop-portal-xapp/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-desktop-portal-xapp-1.0.4.tar.gz 88429 BLAKE2B 7f45a252a5c0dd433238a58012c65369240e7974a93d3d2b5b73bdbc91509480977ad1ce381a6f4ee3a0c87bfabd11ce87bf99839018811a84378e54be1ef36f SHA512 3f861473a763c37a1af95e3beb13c3364a04f557310d5a6520845bc754941149eb3d80a4e2893699715ff11b135edb2859f6349b6aa6fbe0aa1e173263e22dba
-EBUILD xdg-desktop-portal-xapp-1.0.4.ebuild 806 BLAKE2B 714d9163aed078d2b82859a61744125dce309d2c487b6ae176d9c6911d584df31ee265831db03fb9d6056de22dbb78adf76484d3d009d3e6cbf4058a9b5b95b9 SHA512 dfb1f964ab78da32c43a2b10177a456d248f443014b9a68c4b3863b7911bdc2c574ec3ae846b968273384425916faac3e18da3e176c222fc9b93614c07772cfc
+EBUILD xdg-desktop-portal-xapp-1.0.4.ebuild 805 BLAKE2B 20f517488cbb30bb208b172c51368b534269b6d1fc35a1cb54b3bb9712c18a74b505a58fe2f2925ccc945d41256f4ad4ffe3b6ae28c745fe53a313c411cc7622 SHA512 617025a97676ebe35cdf298b0ac6b9cdb043dc9870f7c9fb50b53fb2ad36ba7557228fcff2cd2fef81fc995b243897bf6f2f969857e7724ecf25299a3b6e93d9
 MISC metadata.xml 503 BLAKE2B d18cb4ecc008c396116061965eb5a07fccdab52684891a4200da5141d7f2f26d519eef4c81980e05f86d8ab337e5b8aadc5da19ee73b951ff632cb0e998ff7bc SHA512 72cae90440ff0c8d50361d9a2bc5b9e1dc6c4e4f59e12197aeb664b75cfc1d38f5f00e2bb051c953451932198ce0bbb53e295f8391ddc9090b0cde26e06be98e
diff --git a/sys-apps/xdg-desktop-portal-xapp/xdg-desktop-portal-xapp-1.0.4.ebuild b/sys-apps/xdg-desktop-portal-xapp/xdg-desktop-portal-xapp-1.0.4.ebuild
index 9d6c9bec552a..837fea0d5546 100644
--- a/sys-apps/xdg-desktop-portal-xapp/xdg-desktop-portal-xapp-1.0.4.ebuild
+++ b/sys-apps/xdg-desktop-portal-xapp/xdg-desktop-portal-xapp-1.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxmint/xdg-desktop-portal-xapp/archive/${PV}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	>=dev-libs/glib-2.44:2