commit: 9968e5f499f170ea40abe8996cb63f94e2e52a8c Author: Greg Depoire--Ferrer <greg.depoire <AT> gmail <DOT> com> AuthorDate: Wed Aug 4 10:37:52 2021 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sat Aug 7 08:24:50 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9968e5f4
sys-auth/seatd: Add builtin and server IUSE flags The builtin flag is for enabling the embedded server backend in libseat that doesn't require starting a standalone server. It was disabled in the package previously but some users might want to enable it. The `server` flag is for enabling the standalone server. It was enabled in the package previously but some users might want to disable it. Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Greg Depoire--Ferrer <greg.depoire <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/21877 Acked-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me> Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> sys-auth/seatd/metadata.xml | 4 ++++ .../seatd/{seatd-9999.ebuild => seatd-0.5.0-r1.ebuild} | 15 ++++++++++----- sys-auth/seatd/seatd-9999.ebuild | 13 +++++++++---- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/sys-auth/seatd/metadata.xml b/sys-auth/seatd/metadata.xml index 260cfe0a1e1..dad3217f8ee 100644 --- a/sys-auth/seatd/metadata.xml +++ b/sys-auth/seatd/metadata.xml @@ -9,4 +9,8 @@ <email>proxy-ma...@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> +<use> + <flag name="builtin">Enable embedded server in libseat</flag> + <flag name="server">Enable standalone seatd server</flag> +</use> </pkgmetadata> diff --git a/sys-auth/seatd/seatd-9999.ebuild b/sys-auth/seatd/seatd-0.5.0-r1.ebuild similarity index 74% copy from sys-auth/seatd/seatd-9999.ebuild copy to sys-auth/seatd/seatd-0.5.0-r1.ebuild index ab311a6c598..ea510f9db2a 100644 --- a/sys-auth/seatd/seatd-9999.ebuild +++ b/sys-auth/seatd/seatd-0.5.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,12 +11,12 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/seatd" else - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" SRC_URI="https://git.sr.ht/~kennylevinsen/seatd/archive/${PV}.tar.gz -> ${P}.tar.gz" fi LICENSE="MIT" SLOT="0/1" -IUSE="elogind systemd" +IUSE="builtin elogind +server systemd" REQUIRED_USE="?? ( elogind systemd )" DEPEND=" @@ -30,6 +30,8 @@ src_configure() { local emesonargs=( -Dman-pages=enabled -Dwerror=false + $(meson_feature builtin) + $(meson_feature server) ) if use elogind || use systemd; then @@ -43,6 +45,9 @@ src_configure() { src_install() { meson_src_install - newinitd "${FILESDIR}/seatd.initd" seatd - systemd_dounit contrib/systemd/seatd.service + + if use server; then + newinitd "${FILESDIR}/seatd.initd" seatd + systemd_dounit contrib/systemd/seatd.service + fi } diff --git a/sys-auth/seatd/seatd-9999.ebuild b/sys-auth/seatd/seatd-9999.ebuild index ab311a6c598..c826e115f27 100644 --- a/sys-auth/seatd/seatd-9999.ebuild +++ b/sys-auth/seatd/seatd-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ else fi LICENSE="MIT" SLOT="0/1" -IUSE="elogind systemd" +IUSE="builtin elogind +server systemd" REQUIRED_USE="?? ( elogind systemd )" DEPEND=" @@ -30,6 +30,8 @@ src_configure() { local emesonargs=( -Dman-pages=enabled -Dwerror=false + $(meson_feature builtin libseat-builtin) + $(meson_feature server) ) if use elogind || use systemd; then @@ -43,6 +45,9 @@ src_configure() { src_install() { meson_src_install - newinitd "${FILESDIR}/seatd.initd" seatd - systemd_dounit contrib/systemd/seatd.service + + if use server; then + newinitd "${FILESDIR}/seatd.initd" seatd + systemd_dounit contrib/systemd/seatd.service + fi }