diff options
-rw-r--r-- | sys-auth/elogind/Manifest | 6 | ||||
-rw-r--r-- | sys-auth/elogind/elogind-252.9.ebuild | 45 | ||||
-rw-r--r-- | sys-auth/elogind/elogind-252.9999.ebuild | 33 | ||||
-rw-r--r-- | sys-auth/elogind/elogind-255.9999.ebuild | 65 |
4 files changed, 115 insertions, 34 deletions
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest index a3a0dd1..d9ae06b 100644 --- a/sys-auth/elogind/Manifest +++ b/sys-auth/elogind/Manifest @@ -6,7 +6,7 @@ AUX elogind-252.9-musl-lfs.patch 2152 BLAKE2B cad592f4cec32add7acc62ba1de3d9706f AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7 AUX elogind.init 710 BLAKE2B e8ea4bd17525080cf34c122cdfc14318a136e2b15ffcb1066b0945d65c9854e9964d73215dfd405bd4b1a7e6cbd1aad317bf221832d4f17c5ee60c42e981c691 SHA512 ef0a89dbfbc8571c2fa04c0ee24cab1f4afaa4608e57a748242d82ee5ae3ab4fc3917c7a3a27bcf1b2f645e4bf7f75e58412746a2fe21c454e9f2d2fd7a309c7 DIST elogind-252.9.tar.gz 1922777 BLAKE2B dd566125e407b3479a44b007890f97c9c87a325b3fed2d3505499d2163f113affd998e14b1c1fc50b9b86b0d155b51dae344dcc1cddafb6a48c631d0a0f00c9a SHA512 eed620cbc2f03bfeae6a80c9a421c21d3293fa40adffb96c7e4d86508c06712041f6623fb2bac15ecbb85faca4b5674ea6423b3067840809fb27d023fd9e5ffd -EBUILD elogind-252.9.ebuild 4192 BLAKE2B 9bb8c7e823dd5b339bb1598d7d88a183612be255b3ed1e92387043b511b683a86dfb855e4a67284e4025292b3c52e1bfe13738dcd97f3a7fa9e742a297b478fc SHA512 db4e0d552b4c22c1859543f1a24cf9dcab0d2920e0b55a8272b0982fce19ee25de199f7c0632085def607287ed004237a99df8b67855f746af3bab95f6367ae1 -EBUILD elogind-252.9999.ebuild 3441 BLAKE2B a2cf3ba74631bf40457e87bda6387856ca69afecc14d77e92bb87b3e1f1c00456291bf8384184a95f6e6e5017283db4a5a85e3da1e693a97d85f63c66fdbef7a SHA512 0463e7265768c0f37e600a01ace430254bf6856c9216da393eb1291e9ab18f6e79b540e9ac89ba8803da6e7e8ae3855c58e6fc42ef6b03f4700b3f3befd76818 -EBUILD elogind-255.9999.ebuild 3399 BLAKE2B 1c6b70abd6109cf1013e123e044be37399f2299f4e5a8db44196faeca82509c96e93ae4b623c61f3bc7e03e3e9eca8b8bda0b8213d08d6b498a644cf0908880c SHA512 2ebc8a6629ab09211a01b6dd0989886206337142ffeb82f91e30dc95879b64062fe1d4a958b6d705a2995931d4117f8c70b48ce18df59235327f1ee5a30bdc8d +EBUILD elogind-252.9.ebuild 4591 BLAKE2B 4c3f6dbb9d97e927209177612b3217404dbc20ce705d7ae059c9c237a30f30c4ba10293551a5a2c89cc0f3517527866754c59cc59c365dc0228e6002c2be912c SHA512 e9b5a4babc0e64180651ce10658a0438094a36dd6cbab8186d84b1e964fcb3ac5d42821f4ed75cec327afb7a3cb3b13be610bfaf473bfefdf516fb7ac4a521c8 +EBUILD elogind-252.9999.ebuild 4428 BLAKE2B a005cbecc2392dd6afc705fed6e2579660bc6849d3cde5ee238737f9ad93f75cbc1dcd6fa04ac1cb1478046ccd2f02f80ee7ad5073abcfaeb018ddd91be48095 SHA512 a94453895062a8b38b48780130b2df36fd7e0b581023b53631f8f37227dbbb046f14f28b5667ef995f293506e68fc3ec60ddd1206886dcf607e5e8fd5403eab0 +EBUILD elogind-255.9999.ebuild 4750 BLAKE2B fce9bbe37c7d1ccbdd97b76de54a98214202cf6ec6722a2cbbd80eb4bae8c4a3bed2cfb3ddac02000ff641f123f7ef6da3df16e52b5702627bcf468786db1212 SHA512 a6e76ebaf2bacdfdc71759e4a7940686bb060e8909af2eaffbdb75a4edfd48faddbf6a89d8ddc5bd503809b5e44dac8fde27e62b9d0375f50897249d4677d2d5 MISC metadata.xml 447 BLAKE2B b8fc20f4e04261ccbb05131677e3d106691cd1f9072b38b9797a117763a6d457a89903181ec72eb632bd71ef9119104ba595152cc7da9aac24ec88e870f33690 SHA512 cd30dbc3bfd38f06686b6b9645042617c91b331cf03a95e9c7dba428f21e163d771b10fcfa899f3dc2de4028a7589f8aa0160b7d7b7505186b87a4eda2380dc7 diff --git a/sys-auth/elogind/elogind-252.9.ebuild b/sys-auth/elogind/elogind-252.9.ebuild index 73209e1..9ffe36e 100644 --- a/sys-auth/elogind/elogind-252.9.ebuild +++ b/sys-auth/elogind/elogind-252.9.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/elogind/elogind" LICENSE="CC0-1.0 LGPL-2.1+ public-domain" SLOT="0" -IUSE="+acl audit debug doc +pam +policykit selinux test" +IUSE="+acl audit +cgroup-hybrid debug doc +pam +policykit selinux test" RESTRICT="!test? ( test )" BDEPEND=" @@ -71,34 +71,41 @@ src_prepare() { } src_configure() { - # Removed -Ddefault-hierarchy=${cgroupmode} - # -> It is completely irrelevant with -Dcgroup-controller=openrc anyway. + if use cgroup-hybrid; then + cgroupmode="hybrid" + else + cgroupmode="unified" + fi + + python_setup + local emesonargs=( $(usex debug "-Ddebug-extra=elogind" "") --buildtype $(usex debug debug release) + -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" + -Dzshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions" -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 - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" -Dhtml=$(usex doc auto false) - -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html" -Dinstall-sysconfdir=true -Dman=auto -Dmode=release -Dpam=$(usex pam true false) - -Dpamlibdir=$(getpam_mod_dir) - -Drootlibdir="${EPREFIX}"/$(get_libdir) - -Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind - -Drootprefix="${EPREFIX}/" -Dselinux=$(usex selinux true false) -Dsmack=true -Dtests=$(usex test true false) - -Dudevrulesdir="${EPREFIX}$(get_udevdir)"/rules.d -Dutmp=$(usex elibc_musl false true) - -Dzshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions" ) meson_src_configure @@ -114,6 +121,7 @@ src_install() { } pkg_postinst() { + udev_reload 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." @@ -146,4 +154,17 @@ pkg_postinst() { elog "when the first service calls it via dbus." fi fi + + for version in ${REPLACING_VERSIONS}; do + if ver_test "${version}" -lt 252.9; then + elog "Starting with release 252.9 the sleep configuration is now done" + elog "in the /etc/elogind/sleep.conf. Should you use non-default sleep" + elog "configuration remember to migrate those to new configuration file." + fi + done } + +pkg_postrm() { + udev_reload +} + diff --git a/sys-auth/elogind/elogind-252.9999.ebuild b/sys-auth/elogind/elogind-252.9999.ebuild index 9098afd..12e692a 100644 --- a/sys-auth/elogind/elogind-252.9999.ebuild +++ b/sys-auth/elogind/elogind-252.9999.ebuild @@ -109,6 +109,16 @@ src_install() { pkg_postinst() { udev_reload + 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 @@ -118,10 +128,27 @@ pkg_postinst() { ewarn "# rc-update del elogind default" ewarn "# rc-update add elogind boot" else - ewarn "elogind is currently not started from any runlevel." - ewarn "You may add it to the boot runlevel by:" - ewarn "# rc-update add elogind boot" + 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 + + for version in ${REPLACING_VERSIONS}; do + if ver_test "${version}" -lt 252.9; then + elog "Starting with release 252.9 the sleep configuration is now done" + elog "in the /etc/elogind/sleep.conf. Should you use non-default sleep" + elog "configuration remember to migrate those to new configuration file." + fi + done } pkg_postrm() { diff --git a/sys-auth/elogind/elogind-255.9999.ebuild b/sys-auth/elogind/elogind-255.9999.ebuild index 882ae78..1512166 100644 --- a/sys-auth/elogind/elogind-255.9999.ebuild +++ b/sys-auth/elogind/elogind-255.9999.ebuild @@ -70,28 +70,31 @@ src_configure() { local emesonargs=( $(usex debug "-Ddebug-extra=elogind" "") --buildtype $(usex debug debug release) + --prefix="${EPREFIX}/usr" --libdir="${EPREFIX}"/usr/$(get_libdir) - -Dacl=$(usex acl true false) - -Daudit=$(usex audit true false) + --libexecdir="${EPREFIX}"/$(get_libdir)/elogind + --localstatedir="${EPREFIX}"/var + --sysconfdir="${EPREFIX}"/etc + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html" + -Ddbuspolicydir="${EPREFIX}"/usr/share/dbus-1/system.d + -Ddbussystemservicedir="${EPREFIX}"/usr/share/dbus-1/system-services + -Dpamlibdir=$(getpam_mod_dir) + -Dudevrulesdir="${EPREFIX}$(get_udevdir)"/rules.d -Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions" + -Dzshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions" + -Dacl=$(usex acl enabled disabled) + -Daudit=$(usex audit enabled disabled) -Dcgroup-controller=openrc -Ddefault-kill-user-processes=true - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" -Defi=$(usex efi true false) - -Dhtml=$(usex doc auto false) - -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html" + -Dhtml=$(usex doc auto disabled) -Dinstall-sysconfdir=true -Dman=auto -Dmode=release - -Dpam=$(usex pam true false) - -Dpamlibdir=$(getpam_mod_dir) - -Drootlibdir="${EPREFIX}"/$(get_libdir) - -Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind - -Drootprefix="${EPREFIX}/" - -Dselinux=$(usex selinux true false) + -Dpam=$(usex pam enabled disabled) + -Dselinux=$(usex selinux enabled disabled) -Dsmack=true - -Dudevrulesdir="$(get_udevdir)"/rules.d - -Dzshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions" ) meson_src_configure @@ -100,6 +103,7 @@ src_configure() { src_install() { meson_src_install + keepdir "${EPREFIX}"/var/lib/elogind newinitd "${FILESDIR}"/${PN}.init ${PN} sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die @@ -108,6 +112,16 @@ src_install() { pkg_postinst() { udev_reload + 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 @@ -117,10 +131,29 @@ pkg_postinst() { ewarn "# rc-update del elogind default" ewarn "# rc-update add elogind boot" else - ewarn "elogind is currently not started from any runlevel." - ewarn "You may add it to the boot runlevel by:" - ewarn "# rc-update add elogind boot" + 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 + + for version in ${REPLACING_VERSIONS}; do + if ver_test "${version}" -lt 255.3; then + elog "Starting with release 255.3 the sleep configuration is now done" + elog "in the /etc/elogind/sleep.conf while the elogind additions have" + elog "been moved to /etc/elogind/sleep.conf.d/10-elogind.conf." + elog "Should you use non-default sleep configuration remember to migrate" + elog "those to a new configuration file in /etc/elogind/sleep.conf.d/." + fi + done } pkg_postrm() { |