diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-06-30 08:11:19 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-06-30 08:11:19 +0100 |
commit | 233e52099f9e6aabadb53480dd52dc33e80b4f10 (patch) | |
tree | 65b24155c9e9e2a6e3067f5a773ed0dd345fde7f /sys-auth/elogind | |
parent | 208e192f563896f230dcf3d57547a5ae30343fb8 (diff) |
sys-auth/elogind : use gentoo's ebuild
Diffstat (limited to 'sys-auth/elogind')
-rw-r--r-- | sys-auth/elogind/Manifest | 1 | ||||
-rw-r--r-- | sys-auth/elogind/elogind-246.10-r3.ebuild | 151 | ||||
-rw-r--r-- | sys-auth/elogind/files/elogind-241.4-broken-test.patch | 15 | ||||
-rw-r--r-- | sys-auth/elogind/files/elogind-243.7-nodocs.patch | 29 | ||||
-rw-r--r-- | sys-auth/elogind/files/elogind-246.10-clang-undefined-symbol.patch | 20 | ||||
-rw-r--r-- | sys-auth/elogind/files/elogind-246.10-revert-polkit-automagic.patch | 38 | ||||
-rw-r--r-- | sys-auth/elogind/files/elogind.conf.in | 7 | ||||
-rw-r--r-- | sys-auth/elogind/files/elogind.init-r1 | 27 |
8 files changed, 0 insertions, 288 deletions
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest deleted file mode 100644 index 871cbc88..00000000 --- a/sys-auth/elogind/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST elogind-246.10.tar.gz 1559256 BLAKE2B 17a8146ee08c8ccf167f25d89b1d4525050ed0b0baaad0d36924ad3c40ffc820ef1528b33557cf285ad06c9ac9c440137428c5a235a2acf563e56f2f8f07e208 SHA512 9db0f068ed94ec07bab4d764ccb38840af3d05a4b7c9c539721906f5381b509cb9a3cbfb0453a978210d306136368de6162578c600d522416ef2a7ac1b9f348b diff --git a/sys-auth/elogind/elogind-246.10-r3.ebuild b/sys-auth/elogind/elogind-246.10-r3.ebuild deleted file mode 100644 index 9b6bcc1a..00000000 --- a/sys-auth/elogind/elogind-246.10-r3.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2022 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 ~ia64 ~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 - dev-util/intltool - 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" -) - -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) - --buildtype $(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} - - rm -rf ${ED}/lib/udev/rules.d/73-seat-late.rules -} - -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/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 <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.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 $? -} |