diff options
| author |   Sven Eden <sven.eden@prydeworx.com> | 2023-01-03 09:21:03 +0100 |
|---|---|---|
| committer | Sven Eden <sven.eden@prydeworx.com> | 2023-01-03 09:21:03 +0100 |
| commit | 56822aec68bb6346e77cbcb77de13d2d1b5d309d (patch) | |
| tree | bfdb0ebb3c7cacca1950b2ceeb9827894d074d04 /sys-auth/elogind | |
| parent | sys-auth/elogind: add 252.9999 (diff) | |
| download | seden-56822aec68bb6346e77cbcb77de13d2d1b5d309d.tar.gz seden-56822aec68bb6346e77cbcb77de13d2d1b5d309d.tar.bz2 seden-56822aec68bb6346e77cbcb77de13d2d1b5d309d.zip | |
sys-auth/elogind: Some cleanup. Also removed cgroup controller mode,
because elogind is never meant to act as a pseudo cgroup-controller
on Gentoo systems anyway.
Signed-off-by: Sven Eden <sven.eden@prydeworx.com>
Diffstat (limited to 'sys-auth/elogind')
| -rw-r--r-- | sys-auth/elogind/Manifest | 2 | ||||
| -rw-r--r-- | sys-auth/elogind/elogind-252.9999.ebuild | 35 |
2 files changed, 10 insertions, 27 deletions
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest index c3316e7..b931e3f 100644 --- a/sys-auth/elogind/Manifest +++ b/sys-auth/elogind/Manifest @@ -8,5 +8,5 @@ EBUILD elogind-239.9999.ebuild 3425 BLAKE2B f7215d234109d726268febb35732885fbe94 EBUILD elogind-241.9999.ebuild 3425 BLAKE2B a4a866d0c5450b74ab930ca887693d1d0c3f4c14c960ff76d663cb03d8428d4c40bd9ca1a56abeb8878e069732b31a4e187f269845e41b5a4ff35c68a7279a13 SHA512 8e964ff8540f21f62bd30cd7bbfcee18ff02e28cc642da2b162f32942dfaa132e3c975227ba42cf8985e6bd175825584f8f5da3aefd3c057eef6e8fd516c7837 EBUILD elogind-243.9999.ebuild 3460 BLAKE2B b6e80a4d066da7e474c3d17ae4c39a6b6e668d37cdcc9540440000e5dd5f7c9bf1483d62be0c7eb4d3f67dc2da80d3c3f83b4809057b44a187cf7d67816c6975 SHA512 b4780a401f7dff43d907827529cec99ba0ca59264a0d7c85fbe0bd2af79e489fa21f64de50d08edaf8bb29f47c1dfb7761efe80ffdab1f19ca8d33e0ce2282d7 EBUILD elogind-246.9999.ebuild 3460 BLAKE2B c3d2b66f154b20f506df1e35b0d735a1504a805dcb86ccee7f72866a6b4feecf610b373ee8c6704c66a7ac31acca079ca337429fd1cdda9764198f1a72f7f202 SHA512 68d73b64f44a08b0dbe7cde68ebbb3d4368bf0271627be943382ea80c7d2c6cce624b06df1f5a30a2512c0bb594c51e37e7e71cdfdec233f023016660a4fdb88 -EBUILD elogind-252.9999.ebuild 3474 BLAKE2B 3d16bbef730d3023276dda1b6c7df7f8a91580011645b9148212041b954b6483cc3270827dd0d00fec1fafc31d0325d4a84d823a2e7229e431d7b4f7a8fb7a0f SHA512 f4eb93a867ba7be610888660686ef43299b8f14145647a982aed4eed29d680bd504c3153c27a2fdca412a5c4e41373d2adb33283e13378ca1abe286b0ad2664c +EBUILD elogind-252.9999.ebuild 3037 BLAKE2B 6113bdc72992d24fe22a338812e07a3a7a342950c8a33046e5b6b822d7733f3bc63a11ed8bcbabec0c2951774ccb0914936efb3f523d3a2ee331ed85e8a51d2c SHA512 4322277f7513d57468608ec3aabd4b05acd4ef086e47ab601ce2f8b22629547111992d35e316789fc5237a38b9bbd1e6e5e2280047e87fdaffcc2d269f6c460d MISC metadata.xml 447 BLAKE2B b8fc20f4e04261ccbb05131677e3d106691cd1f9072b38b9797a117763a6d457a89903181ec72eb632bd71ef9119104ba595152cc7da9aac24ec88e870f33690 SHA512 cd30dbc3bfd38f06686b6b9645042617c91b331cf03a95e9c7dba428f21e163d771b10fcfa899f3dc2de4028a7589f8aa0160b7d7b7505186b87a4eda2380dc7 diff --git a/sys-auth/elogind/elogind-252.9999.ebuild b/sys-auth/elogind/elogind-252.9999.ebuild index 0920457..ffa4a5e 100644 --- a/sys-auth/elogind/elogind-252.9999.ebuild +++ b/sys-auth/elogind/elogind-252.9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic git-r3 linux-info meson pam udev xdg-utils +inherit git-r3 linux-info meson pam udev xdg-utils DESCRIPTION="The systemd project's logind, extracted to a standalone package" HOMEPAGE="https://github.com/elogind/elogind" @@ -14,9 +14,10 @@ EGIT_SUBMODULES=() LICENSE="CC0-1.0 LGPL-2.1+ public-domain" SLOT="0" KEYWORDS="" -IUSE="+acl debug doc efi +pam +policykit selinux" +IUSE="+acl audit debug doc efi +pam +policykit selinux" COMMON_DEPEND=" + audit? ( sys-process/audit ) sys-apps/util-linux sys-libs/libcap virtual/libudev:= @@ -48,9 +49,7 @@ PATCHES=( pkg_setup() { local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD" - if use kernel_linux; then - linux-info_pkg_setup - fi + use kernel_linux && linux-info_pkg_setup } src_prepare() { @@ -59,33 +58,17 @@ src_prepare() { } src_configure() { - local rccgroupmode="$(grep rc_cgroup_mode /etc/rc.conf | cut -d '"' -f 2)" - local cgroupmode="legacy" - local debugmode="" - - if [[ "xhybrid" = "x${rccgroupmode}" ]]; then - cgroupmode="hybrid" - elif [[ "xunified" = "x${rccgroupmode}" ]]; then - cgroupmode="unified" - fi - - if use debug; then - debugmode="-Ddebug-extra=elogind" - fi - - # Duplicating C[XX]FLAGS in LDFLAGS is deprecated and will become - # a hard error in future meson versions: - filter-ldflags $CFLAGS $CXXFLAGS - + # Removed -Ddefault-hierarchy=${cgroupmode} + # -> It is completely irrelevant with -Dcgroup-controller=openrc anyway. local emesonargs=( - $debugmode + $(usex debug "-Ddebug-extra=elogind" "") --buildtype $(usex debug debug release) --libdir="${EPREFIX}"/usr/$(get_libdir) -Dacl=$(usex acl true false) + -Daudit=$(usex audit true false) -Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions" -Dcgroup-controller=openrc - -Ddefault-hierarchy=${cgroupmode} - -Ddefault-kill-user-processes=false + -Ddefault-kill-user-processes=true -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" -Defi=$(usex efi true false) -Dhtml=$(usex doc auto false) |