gentoo auto-resync : 25:11:2024 - 03:02:44

11 files changed, 17 insertions, 426 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 59cca6cf0dde..58da54f97d6c 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index adba390ea2b7..0f2a8348f617 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,9 +1,3 @@
-AUX elogind-241.4-broken-test.patch 436 BLAKE2B 204591800f415b00535bcd520435ea91ca59077438a1f07d1ecaf1cd68556cf1915460cacb2e3a062702dd84c8ca9729e7c4dfdd385a0435329784c8a33b4a66 SHA512 55435fa4cf902299f4957361393e7d1c5394970193fd814019d4dd5f9abddce3a7ea1da507eee4712f2f98284a989af8b22b6e1ff8a71e8faeb82417d1891c97
-AUX elogind-243.7-nodocs.patch 999 BLAKE2B f4fc95f14ce0412e88bb8b2a001975fae3b42bdf82c1f23b28e4b2cc635d92722c6317ac919bedd1dfbcc47faf4a177d6662b3b04569ce993e1b8fd5ce8bde15 SHA512 87c6072f95b9fe752324ae8dce576a70f795c31115f4b7478cd66c0ab22e50d0035620b5a278f042bc95635423056b1a7984ed81b32e9011dee84b9a5dec7566
-AUX elogind-246.10-clang-undefined-symbol.patch 1090 BLAKE2B aaad5048696084e0a010c9a6716a91af686d76199e4e7e83d7857c02f782e18e2c7c8a716677372dda115d19b54290db55c62a5c32deb3553d0341495aa73937 SHA512 6766eb5d34135cd581d50f8a9eabda4826731368234522d1c5a94775d54f4d90b1195348ad7a0f6f2af0e2460a9d359859072c57c41085b92707f7044ab46956
-AUX elogind-246.10-loong.patch 1493 BLAKE2B 40fbeae11f4f8387e0880e0ad91dc42577e0e8b160a0d916471ae852b5e40ff425b85668c04cb1e54c7f7087d05f3fcf0216938616b07bb413dfcc7be2220f34 SHA512 befb95281c83ec0421a16e26402c58a49d8a3c9e3100c8c164c1537073be5af2416ac2561271d7e4965d88c2693e8e2face3ca0b486bbef2f00216fa0c20396f
-AUX elogind-246.10-musl-selinux.patch 3857 BLAKE2B 831b48c0b7eff35099325ca586ac39ed4c477c9298aa740da85d82c05625aeeab47aff4b19eb10318834f9d6e8256079e9c148c19f66d65b2a7433e2baeecf51 SHA512 9db4f7e1c4bcf7bbf743c89ce36162b3976f116ca0257081d6e74f46dab67b6f9bd3db8e33b06dd6a334fa1d20d513a631220924028ec330af815434adac85c3
-AUX elogind-246.10-revert-polkit-automagic.patch 1345 BLAKE2B 115c8f38f23b140b5f232cb80fa2486ad90895a0fad3717d79302ac2205fa260d35aab9fdbc98bf490790749b109d32f59cfee166da26a9457676943cf6a57b7 SHA512 84e7b8e09ffd41bd0ea466e4f7fbc333c42544d9ed6877b881dc68c55607e81406ca977c3c0c045db8e151f76df1c7c813395ccb73b6e38583ddd40c642244f1
 AUX elogind-252.9-musl-1.2.5.patch 1646 BLAKE2B 105ed799d16997f86d5c05a33b95bb6514c2e2f7ada84e8ba9c9dc513e93bb6fa057ee45ec873fae5c1a148097425bc2b3e858567f887423e244652de23fdea4 SHA512 dc5f6d75668a4058587cb0f8b19d6192059e733a878814ba06af2004d61ab4231a879688390f6ec184e7a6a1a83c1a2fa4c7b5cca7c664ddaa683216597c0727
 AUX elogind-252.9-musl-getdents.patch 1806 BLAKE2B 5d79695d51a06785bd2d83e57d0379c38f812890e567e96b6ccc00aa61feedb987c5a34b754b4682fe50d6bda8870290f026f800d91f4a9b445d784884db191d SHA512 d684b546762ca6a133e7b4395be514dfb1516c9e8e28c97ea216f4fa1bb66caa64db90cff19f68ac2cc2c5eb347ef813b9e030245c9fe1159f7d40ad8d63e666
 AUX elogind-252.9-musl-gshadow.patch 357 BLAKE2B ed804dee44af417163b7a286f83393457720712bbb2feabc202221925f2fa44149530a9b0adb30063e7d6f9846abb7a350644b4edc5c3f77da3d21b0eda62a6a SHA512 b69598c6ff56155b8f73bb4684bca6fd66011a9088e0007499617621d2f2b8b5683efabb414d1376a27f931d5372cfda845ad50e4e2efa498391529a22909108
@@ -20,12 +14,9 @@ AUX elogind-255.5-part-revert-header-cleanup.patch 1055 BLAKE2B 4adde378e1e290b9
 AUX elogind-255.5-revert-s2idle.patch 6089 BLAKE2B ad21048bd5a96f257d53a26731ff8c054817f32b9090089bf34ef1ee766277c7d21768755eac88deb744315e3e932e25e468bbce01f3f3eef87559c4539815cb SHA512 4685d4600c2a019178565bc2af0f2b8dc8eddebe6ac70f3c8d38bd8e2fbbbfb790685893fb91c053088b817c505e3f2a4bcd14375da6ba2d50bb65eb677f45da
 AUX elogind.conf 217 BLAKE2B ef4325ab66f7cc3c76d44f913c73f99ddf31b3c2248c3cc822e7be37886fdbdd4411974d6d6c139674a51f28f6c0dbca2f5091227e550b4747ed9b22837fa096 SHA512 7e9654deb46330ee17d5f7ba71332edcc86c1ab2ef0a54be8f722c409cdae5eedbbc818cc83350457891af39cde777b0390217fd6befb7d4e868ac41b569aed0
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
-AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
 AUX elogind.init-r1 503 BLAKE2B 7e54688c91f78b46411edff04dd8544dea778864d34ec00a4f0f2c166b4062ebc6b01f201f1b7d1f22f6781c51ac22f924136c83c0b0cdb29d6aadf640a6c0e8 SHA512 97d78afe1c0833f3f632272904bd8338869639facb79cd2fae6a4bf58fc5b2dd960484e1f9945152ff13d075216cf4b48b6b234eb7738fbbf445eee2c20e88f2
-DIST elogind-246.10.tar.gz 1559256 BLAKE2B 17a8146ee08c8ccf167f25d89b1d4525050ed0b0baaad0d36924ad3c40ffc820ef1528b33557cf285ad06c9ac9c440137428c5a235a2acf563e56f2f8f07e208 SHA512 9db0f068ed94ec07bab4d764ccb38840af3d05a4b7c9c539721906f5381b509cb9a3cbfb0453a978210d306136368de6162578c600d522416ef2a7ac1b9f348b
 DIST elogind-252.9.tar.gz 1922777 BLAKE2B dd566125e407b3479a44b007890f97c9c87a325b3fed2d3505499d2163f113affd998e14b1c1fc50b9b86b0d155b51dae344dcc1cddafb6a48c631d0a0f00c9a SHA512 eed620cbc2f03bfeae6a80c9a421c21d3293fa40adffb96c7e4d86508c06712041f6623fb2bac15ecbb85faca4b5674ea6423b3067840809fb27d023fd9e5ffd
 DIST elogind-255.5.tar.gz 2127126 BLAKE2B 395352fc24bc815d1e39c2d5722eb09c2e3378873e2ea4173d8c209cd66c28a9b94ebe62ab3efbd5dccd822d99b86a6c1a871620adefb1215cb6d4ceee78a9f9 SHA512 dd9494062ef18c3c4cddbaf70b394bf90f6da3ce49f85312e99eabde54b2fcdb5cfdde1bcbaa661031afc72853e9b138dae336e1caed72e927bfd61c8cb22895
-EBUILD elogind-246.10-r4.ebuild 4197 BLAKE2B dc12dddbecad6516e5566a73b5db4a64c97489dc3bf4abf8b1baf4d28b41361a7ad524199cff14791ac555c52b6909b471ebe5c458d16810ab3de515dc8cf099 SHA512 1673b33cd858ac7c9d3907284fbbd925db823db1a79e87ecae4ea1f0fdc21c23eba8e56c2b8ab81d0e497921737c4624665699615ea3e0dab95ab24f4bc1c4f3
 EBUILD elogind-252.9-r2.ebuild 5238 BLAKE2B 2531e7ea6a230dc615261f2f0b8741de33b6f89d6cff52b1c792564408dc0f2bbe17835a0a7f00bf8d21951b5e0f8ef82045d6f82652869c7ec62832f8e5ee43 SHA512 6a912423c866173f6c961b628eb08f3dd84201926724e15c0642371026b3ee9105d5e39b7ec445dd1a1225e08c01a6f81b55b7534e007f1786729b0548267a37
-EBUILD elogind-255.5-r1.ebuild 4996 BLAKE2B 0a895444386f10c2e5507e9e284cc8e0ceb171432ecd5c8aabc0c402ab2830e381cf64f65235f49d606e7f22c5832349842d939ead7e54abc41fea49818ed119 SHA512 67663cdde583104d50dfbb323023ea431b38a1ae51b7609066d72223704c20dde5f61026847b60b1f2babcd29849e46e447947be40cbb247a3637b0bfbebb0d9
+EBUILD elogind-255.5-r1.ebuild 5586 BLAKE2B 9e9a6f3b0e9f25285061b278113ecc683c882236a6aba849aec5a22c291437c0712b45f629143757ae77d0953d55e8e3cd4cdfcd0d0ebd2f966ba197a25c0929 SHA512 96f9735b45111a7b64193d7bb89ea0d284d10e0aa5ce6af2bc3f985e1edc41997e53558593b2335e2fecd8fab97c037c621c65d2fc08fc3d808ca45eac747cad
 MISC metadata.xml 416 BLAKE2B 5cce321b2ee1ee2893240ecc14b2e3578068e8ae7b94b4fcc641cef0298f7010492a66f4395d5811c62bf32d1b3b939e46bf8c9a7109f185f8bbb84d9ce9d607 SHA512 6f85a23ab09a92c489890397049fcff546be538b4484b5116cd4e5b0a4982a4cc0c587f47ca18c150bcbc5911ef879292fbd142ca1f381254d6ecea41358de6b
diff --git a/sys-auth/elogind/elogind-246.10-r4.ebuild b/sys-auth/elogind/elogind-246.10-r4.ebuild
deleted file mode 100644
index 93a9379c3c74..000000000000
--- a/sys-auth/elogind/elogind-246.10-r4.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_BRANCH="v241-stable"
-	EGIT_REPO_URI="https://github.com/elogind/elogind.git"
-	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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-inherit linux-info meson pam udev xdg-utils
-
-DESCRIPTION="The systemd project's logind, extracted to a standalone package"
-HOMEPAGE="https://github.com/elogind/elogind"
-
-LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
-SLOT="0"
-IUSE="+acl audit +cgroup-hybrid debug doc +pam +policykit selinux test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-util/gperf
-	virtual/pkgconfig
-"
-DEPEND="
-	audit? ( sys-process/audit )
-	sys-apps/util-linux
-	sys-libs/libcap
-	virtual/libudev:=
-	acl? ( sys-apps/acl )
-	pam? ( sys-libs/pam )
-	selinux? ( sys-libs/libselinux )
-"
-RDEPEND="${DEPEND}
-	!sys-apps/systemd
-"
-PDEPEND="
-	sys-apps/dbus
-	policykit? ( sys-auth/polkit )
-"
-
-DOCS=( README.md src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-243.7-nodocs.patch"
-	"${FILESDIR}/${PN}-241.4-broken-test.patch" # bug 699116
-	"${FILESDIR}/${P}-revert-polkit-automagic.patch"
-	"${FILESDIR}/${P}-clang-undefined-symbol.patch"
-	"${FILESDIR}/${P}-loong.patch"
-	"${FILESDIR}/${P}-musl-selinux.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
-
-	use kernel_linux && linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-}
-
-src_configure() {
-	if use cgroup-hybrid; then
-		cgroupmode="hybrid"
-	else
-		cgroupmode="unified"
-	fi
-
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		-Dpamlibdir=$(getpam_mod_dir)
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)"/rules.d
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		-Drootlibdir="${EPREFIX}"/$(get_libdir)
-		-Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind
-		-Drootprefix="${EPREFIX}/"
-		-Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions"
-		-Dman=auto
-		-Dsmack=true
-		-Dcgroup-controller=openrc
-		-Ddefault-hierarchy=${cgroupmode}
-		-Ddefault-kill-user-processes=false
-		-Dacl=$(usex acl true false)
-		-Daudit=$(usex audit true false)
-		-Dbuildtype=$(usex debug debug release)
-		-Dhtml=$(usex doc auto false)
-		-Dpam=$(usex pam true false)
-		-Dselinux=$(usex selinux true false)
-		-Dtests=$(usex test true false)
-		-Dutmp=$(usex elibc_musl false true)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	DOCS+=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
-
-	meson_src_install
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-
-	sed -e "s|@libdir@|$(get_libdir)|" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
-	newconfd ${PN}.conf ${PN}
-}
-
-pkg_postinst() {
-	if ! use pam; then
-		ewarn "${PN} will not be managing user logins/seats without USE=\"pam\"!"
-		ewarn "In other words, it will be useless for most applications."
-		ewarn
-	fi
-	if ! use policykit; then
-		ewarn "loginctl will not be able to perform privileged operations without"
-		ewarn "USE=\"policykit\"! That means e.g. no suspend or hibernate."
-		ewarn
-	fi
-	if [[ "$(rc-config list boot | grep elogind)" != "" ]]; then
-		elog "elogind is currently started from boot runlevel."
-	elif [[ "$(rc-config list default | grep elogind)" != "" ]]; then
-		ewarn "elogind is currently started from default runlevel."
-		ewarn "Please remove elogind from the default runlevel and"
-		ewarn "add it to the boot runlevel by:"
-		ewarn "# rc-update del elogind default"
-		ewarn "# rc-update add elogind boot"
-	else
-		elog "elogind is currently not started from any runlevel."
-		elog "You may add it to the boot runlevel by:"
-		elog "# rc-update add elogind boot"
-		elog
-		elog "Alternatively, you can leave elogind out of any"
-		elog "runlevel. It will then be started automatically"
-		if use pam; then
-			elog "when the first service calls it via dbus, or"
-			elog "the first user logs into the system."
-		else
-			elog "when the first service calls it via dbus."
-		fi
-	fi
-}
diff --git a/sys-auth/elogind/elogind-255.5-r1.ebuild b/sys-auth/elogind/elogind-255.5-r1.ebuild
index 22ad55a76fc2..2081a0952b41 100644
--- a/sys-auth/elogind/elogind-255.5-r1.ebuild
+++ b/sys-auth/elogind/elogind-255.5-r1.ebuild
@@ -172,6 +172,22 @@ pkg_postinst() {
 			elog "configuration remember to migrate those to new configuration file."
 		fi
 	done
+
+	local file files
+	# find custom hooks excluding known (nvidia-drivers, sys-power/tlp)
+	if [[ -d "${EROOT}"/$(get_libdir)/elogind/system-sleep ]]; then
+		readarray -t files < <(find "${EROOT}"/$(get_libdir)/elogind/system-sleep/ \
+			-type f \( -not -iname ".keep_dir" -a \
+				-not -iname "nvidia" -a \
+				-not -iname "49-tlp-sleep" \) || die)
+	fi
+	if [[ ${#files[@]} -gt 0 ]]; then
+		ewarn "*** Custom hooks in obsolete path detected ***"
+		for file in "${files[@]}"; do
+			ewarn "    ${file}"
+		done
+		ewarn "Move these custom hooks to ${EROOT}/etc/elogind/system-sleep/ instead."
+	fi
 }
 
 pkg_postrm() {
diff --git a/sys-auth/elogind/files/elogind-241.4-broken-test.patch b/sys-auth/elogind/files/elogind-241.4-broken-test.patch
deleted file mode 100644
index d2735825900e..000000000000
--- a/sys-auth/elogind/files/elogind-241.4-broken-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/test/meson.build	2019-11-15 08:59:47.000000000 +0100
-+++ b/src/test/meson.build	2019-11-30 13:04:45.051316140 +0100
-@@ -1014,9 +1014,9 @@
- #          '', 'timeout=120'],
- #endif // 0
- 
--        [['src/libelogind/sd-login/test-login.c'],
--         [],
--         []],
-+#         [['src/libelogind/sd-login/test-login.c'],
-+#          [],
-+#          []],
- 
-         [['src/libelogind/sd-device/test-sd-device.c'],
-          [],
diff --git a/sys-auth/elogind/files/elogind-243.7-nodocs.patch b/sys-auth/elogind/files/elogind-243.7-nodocs.patch
deleted file mode 100644
index 0ec0aa37308a..000000000000
--- a/sys-auth/elogind/files/elogind-243.7-nodocs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-We don't want the build system to install to docdir for us.
-
---- a/meson.build	2020-03-12 20:33:40.000000000 +0100
-+++ b/meson.build	2020-03-12 22:46:08.020716935 +0100
-@@ -3352,15 +3352,11 @@
- # install_data('modprobe.d/systemd.conf',
- #              install_dir : modprobedir)
- #endif // 0
--install_data('LICENSE.GPL2',
--             'LICENSE.LGPL2.1',
- #if 0 /// elogind has upgraded to markdown, and the NEWS file is useless
- #              'NEWS',
- #              'README',
- #else // 0
--             'README.md',
- #endif // 0
--             'docs/CODING_STYLE.md',
- #if 0 /// irrelevant for elogind
- #              'docs/DISTRO_PORTING.md',
- #              'docs/ENVIRONMENT.md',
-@@ -3369,8 +3365,6 @@
- #              'docs/TRANSLATORS.md',
- #              'docs/UIDS-GIDS.md',
- #endif // 0
--             'src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
--             install_dir : docdir)
- 
- #if 0 /// UNNEEDED by elogind
- # meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir))
diff --git a/sys-auth/elogind/files/elogind-246.10-clang-undefined-symbol.patch b/sys-auth/elogind/files/elogind-246.10-clang-undefined-symbol.patch
deleted file mode 100644
index 3a157615884e..000000000000
--- a/sys-auth/elogind/files/elogind-246.10-clang-undefined-symbol.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/libelogind/sd-bus/bus-error.h
-+++ b/src/libelogind/sd-bus/bus-error.h
-@@ -28,11 +28,17 @@ int bus_error_set_errnofv(sd_bus_error *e, int error, const char *format, va_lis
-  * the bus error table, and BUS_ERROR_MAP_ELF_USE has to be used at
-  * least once per compilation unit (i.e. per library), to ensure that
-  * the error map is really added to the final binary.
-+ *
-+ * In addition, set the retain attribute so that the section cannot be
-+ * discarded by ld --gc-sections -z start-stop-gc. Older compilers would
-+ * warn for the unknown attribute, so just disable -Wattributes.
-  */
- 
- #define BUS_ERROR_MAP_ELF_REGISTER                                      \
-+        _Pragma("GCC diagnostic ignored \"-Wattributes\"")              \
-         _section_("SYSTEMD_BUS_ERROR_MAP")                              \
-         _used_                                                          \
-+        __attribute__((retain))                                         \
-         _alignptr_                                                      \
-         _variable_no_sanitize_address_
-
diff --git a/sys-auth/elogind/files/elogind-246.10-loong.patch b/sys-auth/elogind/files/elogind-246.10-loong.patch
deleted file mode 100644
index f2b418f1384a..000000000000
--- a/sys-auth/elogind/files/elogind-246.10-loong.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://github.com/elogind/elogind/pull/231, but made minimal.
-From: Wu Xiaotian <wuxiaotian@loongson.cn>
-Date: Tue, 1 Sep 2020 12:13:18 +0800
-Subject: [PATCH] architecture: Add support for the LoongArch architecture
-
-(cherry picked from commit 5c0968a2d14d5e1afb40a36c55d3f89805712904)
-[resolved merge conflict for minimal diff, also use __loongarch_lp64
-instead of __loongarch64 -- xen0n]
-
-basic: update the Arch tuples for LoongArch
-
-(cherry picked from commit 017228934833d8618774353dcccbc5ec9f78ce98)
---- a/src/basic/architecture.h
-+++ b/src/basic/architecture.h
-@@ -44,6 +44,7 @@ enum {
-         ARCHITECTURE_RISCV64,
-         ARCHITECTURE_ARC,
-         ARCHITECTURE_ARC_BE,
-+        ARCHITECTURE_LOONGARCH64,
-         _ARCHITECTURE_MAX,
-         _ARCHITECTURE_INVALID = -1
- };
-@@ -200,6 +201,17 @@ int uname_architecture(void);
- #  elif defined(__SH4A__)
- #    define LIB_ARCH_TUPLE "sh4a-linux-gnu"
- #  endif
-+#elif defined(__loongarch_lp64)
-+#  define native_architecture() ARCHITECTURE_LOONGARCH64
-+#  if defined(__loongarch_double_float)
-+#    define LIB_ARCH_TUPLE "loongarch64-linux-gnuf64"
-+#  elif defined(__loongarch_single_float)
-+#    define LIB_ARCH_TUPLE "loongarch64-linux-gnuf32"
-+#  elif defined(__loongarch_soft_float)
-+#    define LIB_ARCH_TUPLE "loongarch64-linux-gnusf"
-+#  else
-+#    error "Unrecognized loongarch architecture variant"
-+#  endif
- #elif defined(__m68k__)
- #  define native_architecture() ARCHITECTURE_M68K
- #  define LIB_ARCH_TUPLE "m68k-linux-gnu"
diff --git a/sys-auth/elogind/files/elogind-246.10-musl-selinux.patch b/sys-auth/elogind/files/elogind-246.10-musl-selinux.patch
deleted file mode 100644
index c36861b983e2..000000000000
--- a/sys-auth/elogind/files/elogind-246.10-musl-selinux.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-https://bugs.gentoo.org/888912
-https://github.com/elogind/elogind/commit/ab72a46f3104f44a32ef7bec7439aa9d3b5f0fdc
-
-Rebased version to apply to 246.10 by concord@.
-
-From ab72a46f3104f44a32ef7bec7439aa9d3b5f0fdc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Fri, 9 Oct 2020 16:48:03 +0200
-Subject: [PATCH] basic/selinux: work around mallinfo deprecation
-
-Latest glibc has deprecated mallinfo(), so it might become unavailable at some point
-in the future. There is malloc_info(), but it returns XML, ffs. I think the information
-that we get from mallinfo() is quite useful, so let's use mallinfo() if available, and
-not otherwise.
---- a/meson.build
-+++ b/meson.build
-@@ -617,6 +617,7 @@ foreach ident : [
-                                  #include <unistd.h>
-                                  #include <signal.h>
-                                  #include <sys/wait.h>'''],
-+        ['mallinfo',          '''#include <malloc.h>'''],
- ]
- 
-         have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE')
---- a/src/basic/macro.h
-+++ b/src/basic/macro.h
-@@ -93,6 +93,10 @@
- #endif
- 
- /* Temporarily disable some warnings */
-+#define DISABLE_WARNING_DEPRECATED_DECLARATIONS                         \
-+        _Pragma("GCC diagnostic push");                                 \
-+        _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-+
- #define DISABLE_WARNING_FORMAT_NONLITERAL                               \
-         _Pragma("GCC diagnostic push");                                 \
-         _Pragma("GCC diagnostic ignored \"-Wformat-nonliteral\"")
---- a/src/basic/selinux-util.c
-+++ b/src/basic/selinux-util.c
-@@ -72,12 +72,21 @@ void mac_selinux_retest(void) {
- #endif
- }
- 
-+#if HAVE_MALLINFO
-+static struct mallinfo mallinfo_nowarn(void) {
-+        /* glibc has deprecated mallinfo(), but the replacement malloc_info() returns an XML blob ;=[ */
-+DISABLE_WARNING_DEPRECATED_DECLARATIONS
-+        return mallinfo();
-+REENABLE_WARNING
-+}
-+#else
-+#	warning "mallinfo() is missing, add mallinfo2() support instead."
-+#endif
-+
- int mac_selinux_init(void) {
- #if HAVE_SELINUX
-         usec_t before_timestamp, after_timestamp;
--        struct mallinfo before_mallinfo, after_mallinfo;
-         char timespan[FORMAT_TIMESPAN_MAX];
--        int l;
- 
-         selinux_set_callback(SELINUX_CB_POLICYLOAD, (union selinux_callback) mac_selinux_reload);
- 
-@@ -87,7 +96,9 @@ int mac_selinux_init(void) {
-         if (!mac_selinux_use())
-                 return 0;
- 
--        before_mallinfo = mallinfo();
-+#if HAVE_MALLINFO
-+        struct mallinfo before_mallinfo = mallinfo_nowarn();
-+#endif
-         before_timestamp = now(CLOCK_MONOTONIC);
- 
-         label_hnd = selabel_open(SELABEL_CTX_FILE, NULL, 0);
-@@ -95,14 +107,17 @@ int mac_selinux_init(void) {
-                 return log_enforcing_errno(errno, "Failed to initialize SELinux labeling handle: %m");
- 
-         after_timestamp = now(CLOCK_MONOTONIC);
--        after_mallinfo = mallinfo();
--
--        l = after_mallinfo.uordblks > before_mallinfo.uordblks ? after_mallinfo.uordblks - before_mallinfo.uordblks : 0;
-+#if HAVE_MALLINFO
-+        struct mallinfo after_mallinfo = mallinfo_nowarn();
-+        int l = after_mallinfo.uordblks > before_mallinfo.uordblks ? after_mallinfo.uordblks - before_mallinfo.uordblks : 0;
- 
-         log_debug("Successfully loaded SELinux database in %s, size on heap is %iK.",
-                   format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0),
--                  (l+1023)/1024);
--
-+                  DIV_ROUND_UP(l, 1024));
-+#else
-+        log_debug("Successfully loaded SELinux database in %s.",
-+                  format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0));
-+#endif
- #endif
-         return 0;
- }
--- 
-2.40.1
diff --git a/sys-auth/elogind/files/elogind-246.10-revert-polkit-automagic.patch b/sys-auth/elogind/files/elogind-246.10-revert-polkit-automagic.patch
deleted file mode 100644
index 5237b7abe72a..000000000000
--- a/sys-auth/elogind/files/elogind-246.10-revert-polkit-automagic.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 715ce0a6459e418f92e74c7ce52df3244c18f383 Mon Sep 17 00:00:00 2001
-From: Sven Eden <sven.eden@prydeworx.com>
-Date: Mon, 8 Mar 2021 08:40:08 +0100
-Subject: [PATCH] Revert "Disable polkit support if libpolkit is not installed"
-
-This reverts commit 1194dec4f8f2d1b8bd14e1625f34418ecfce817e.
-
-Removing polkit support with -Dpolkit=auto when libpolkit is not
-installed, removes the whole interface. This makes it impossible to
-add polkit support as a runtime dependency.
-
-Bug: #167
-Closes: #206
-Signed-off-by: Sven Eden <sven.eden@prydeworx.com>
----
- meson.build | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 2dd05db3c..f38551f55 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1157,15 +1157,6 @@ if want_polkit != 'false' and not skip_deps
-                 message('Old polkit detected, will install pkla files')
-                 install_polkit_pkla = true
-         endif
--#if 1 /// Disable polkit completely if libpolkit is not there. See elogind issue #167
--        if not libpolkit.found()
--                if want_polkit != 'auto'
--                        error('Polkit requested but libpolkit was not found.')
--                endif
--                install_polkit = false
--                want_polkit    = false
--        endif
--#endif // 1
- endif
- conf.set10('ENABLE_POLKIT', install_polkit)
- 
diff --git a/sys-auth/elogind/files/elogind.init b/sys-auth/elogind/files/elogind.init
deleted file mode 100644
index 019c3afbabc5..000000000000
--- a/sys-auth/elogind/files/elogind.init
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need dbus
-
-	# Make sure elogind is up before xdm starts any dm
-	before xdm
-}
-
-start() {
-	ebegin "Starting elogind"
-
-	start-stop-daemon --start --quiet \
-		--pidfile "${ELOGIND_PIDFILE}" \
-		--exec "${ELOGIND_EXEC}" -- --daemon
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping elogind"
-	start-stop-daemon --stop --quiet --pidfile "${ELOGIND_PIDFILE}"
-	eend $?
-}