From 233e52099f9e6aabadb53480dd52dc33e80b4f10 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 30 Jun 2023 08:11:19 +0100 Subject: sys-auth/elogind : use gentoo's ebuild --- .../elogind/files/elogind-241.4-broken-test.patch | 15 --------- sys-auth/elogind/files/elogind-243.7-nodocs.patch | 29 ----------------- .../elogind-246.10-clang-undefined-symbol.patch | 20 ------------ .../elogind-246.10-revert-polkit-automagic.patch | 38 ---------------------- sys-auth/elogind/files/elogind.conf.in | 7 ---- sys-auth/elogind/files/elogind.init-r1 | 27 --------------- 6 files changed, 136 deletions(-) delete mode 100644 sys-auth/elogind/files/elogind-241.4-broken-test.patch delete mode 100644 sys-auth/elogind/files/elogind-243.7-nodocs.patch delete mode 100644 sys-auth/elogind/files/elogind-246.10-clang-undefined-symbol.patch delete mode 100644 sys-auth/elogind/files/elogind-246.10-revert-polkit-automagic.patch delete mode 100644 sys-auth/elogind/files/elogind.conf.in delete mode 100644 sys-auth/elogind/files/elogind.init-r1 (limited to 'sys-auth/elogind/files') 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 d2735825..00000000 --- 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 0ec0aa37..00000000 --- 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 3a157615..00000000 --- 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-revert-polkit-automagic.patch b/sys-auth/elogind/files/elogind-246.10-revert-polkit-automagic.patch deleted file mode 100644 index 5237b7ab..00000000 --- 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 -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 ---- - 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.conf.in b/sys-auth/elogind/files/elogind.conf.in deleted file mode 100644 index 7b05b350..00000000 --- a/sys-auth/elogind/files/elogind.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -# /etc/conf.d/elogind: config file for /etc/init.d/elogind - -# this is the elogind executable -ELOGIND_EXEC="/@libdir@/elogind/elogind" - -# this is where elogind will store its pid file -ELOGIND_PIDFILE="/run/elogind.pid" diff --git a/sys-auth/elogind/files/elogind.init-r1 b/sys-auth/elogind/files/elogind.init-r1 deleted file mode 100644 index 1cb5071c..00000000 --- a/sys-auth/elogind/files/elogind.init-r1 +++ /dev/null @@ -1,27 +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 - - use logger -} - -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 $? -} -- cgit v1.2.3