From c4868ef156cd26531e8f65219b83a60f708e47d6 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Sun, 25 Apr 2021 02:19:39 +0100 Subject: x11-misc/entrance: add user, fix config Package-Manager: Portage-3.0.17, Repoman-3.0.2 --- acct-group/entrance/entrance-0.ebuild | 8 +++++ acct-group/entrance/metadata.xml | 8 +++++ acct-user/entrance/entrance-0.ebuild | 13 ++++++++ acct-user/entrance/metadata.xml | 8 +++++ x11-misc/entrance/entrance-3.0.0_alpha6.ebuild | 43 +++++++++++++++++++++++--- x11-misc/entrance/entrance-9999.ebuild | 43 +++++++++++++++++++++++--- 6 files changed, 113 insertions(+), 10 deletions(-) create mode 100644 acct-group/entrance/entrance-0.ebuild create mode 100644 acct-group/entrance/metadata.xml create mode 100644 acct-user/entrance/entrance-0.ebuild create mode 100644 acct-user/entrance/metadata.xml diff --git a/acct-group/entrance/entrance-0.ebuild b/acct-group/entrance/entrance-0.ebuild new file mode 100644 index 00000000..f730cec6 --- /dev/null +++ b/acct-group/entrance/entrance-0.ebuild @@ -0,0 +1,8 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-group + +ACCT_GROUP_ID=-1 diff --git a/acct-group/entrance/metadata.xml b/acct-group/entrance/metadata.xml new file mode 100644 index 00000000..de37e444 --- /dev/null +++ b/acct-group/entrance/metadata.xml @@ -0,0 +1,8 @@ + + + + + bertrand@jacquin.bzh + Bertrand Jacquin + + diff --git a/acct-user/entrance/entrance-0.ebuild b/acct-user/entrance/entrance-0.ebuild new file mode 100644 index 00000000..37ad269b --- /dev/null +++ b/acct-user/entrance/entrance-0.ebuild @@ -0,0 +1,13 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-user + +DESCRIPTION="User for entrance" +ACCT_USER_ID=-1 +ACCT_USER_GROUPS=( entrance ) +ACCT_USER_HOME=/var/lib/entrance + +acct-user_add_deps diff --git a/acct-user/entrance/metadata.xml b/acct-user/entrance/metadata.xml new file mode 100644 index 00000000..de37e444 --- /dev/null +++ b/acct-user/entrance/metadata.xml @@ -0,0 +1,8 @@ + + + + + bertrand@jacquin.bzh + Bertrand Jacquin + + diff --git a/x11-misc/entrance/entrance-3.0.0_alpha6.ebuild b/x11-misc/entrance/entrance-3.0.0_alpha6.ebuild index 4320488a..af7026d4 100644 --- a/x11-misc/entrance/entrance-3.0.0_alpha6.ebuild +++ b/x11-misc/entrance/entrance-3.0.0_alpha6.ebuild @@ -11,31 +11,64 @@ SRC_URI="https://github.com/Obsidian-StudiosInc/entrance/archive/v${PV}.tar.gz - LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="nls +pam systemd X" +IUSE="nls +pam systemd xcb X" -DEPEND=">=dev-libs/efl-1.19.0[X?,systemd?] +DEPEND=">=dev-libs/efl-1.19.0[systemd?,X?] pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) + xcb? ( x11-libs/libxcb ) " RDEPEND="${DEPEND} X? ( - x11-base/xorg-server x11-apps/sessreg x11-apps/xauth + x11-base/xorg-server ) - acct-user/nobody" + acct-user/entrance" PATCHES=( "${FILESDIR}/${PV}-f526bc6874a1c7cec167e569d60a21787a12a2fd.patch" "${FILESDIR}/${PV}-2c02d1b1d5c7221059f81c5b6c89fe71f23640cc.patch" ) +src_prepare() { + # LFS + sed -i \ + -e '/lockfile/ s|string: .*|string: "/run/entrance.pid";|' \ + -e '/xauth_file/ s|string: .*|string: "/run/entrance.auth";|' \ + data/entrance.conf.in \ + || die + + # Default user + sed -i \ + -e '/start_user/ s|string: .*|string: "entrance";|' \ + data/entrance.conf.in \ + || die + + # Ensure first VT is used + sed -i \ + -e '/vtnr/ s|ushort: .*|ushort: 1;|' \ + data/entrance.conf.in \ + || die + + if use systemd ; then + sed -i \ + -e '/reboot/ s|string: .*|string: "/usr/bin/systemctl reboot";|' \ + -e '/shutdown/ s|string: .*|string: "/usr/bin/systemctl poweroff";|' \ + -e '/suspend/ s|string: .*|string: "/usr/bin/systemctl suspend";|' \ + data/entrance.conf.in \ + || die + fi + + default +} + src_configure() { local emesonargs=( -Dconsolekit=false - $(meson_use systemd logind) $(meson_use nls) $(meson_use pam) + $(meson_use systemd logind) ) meson_src_configure diff --git a/x11-misc/entrance/entrance-9999.ebuild b/x11-misc/entrance/entrance-9999.ebuild index d378fbdb..2790b033 100644 --- a/x11-misc/entrance/entrance-9999.ebuild +++ b/x11-misc/entrance/entrance-9999.ebuild @@ -11,26 +11,59 @@ EGIT_REPO_URI="https://github.com/Obsidian-StudiosInc/entrance.git" LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="nls +pam systemd X" +IUSE="nls +pam systemd xcb X" -DEPEND=">=dev-libs/efl-1.19.0[X?,systemd?] +DEPEND=">=dev-libs/efl-1.19.0[systemd?,X?] pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) + xcb? ( x11-libs/libxcb ) " RDEPEND="${DEPEND} X? ( - x11-base/xorg-server x11-apps/sessreg x11-apps/xauth + x11-base/xorg-server ) - acct-user/nobody" + acct-user/entrance" + +src_prepare() { + # LFS + sed -i \ + -e '/lockfile/ s|string: .*|string: "/run/entrance.pid";|' \ + -e '/xauth_file/ s|string: .*|string: "/run/entrance.auth";|' \ + data/entrance.conf.in \ + || die + + # Default user + sed -i \ + -e '/start_user/ s|string: .*|string: "entrance";|' \ + data/entrance.conf.in \ + || die + + # Ensure first VT is used + sed -i \ + -e '/vtnr/ s|ushort: .*|ushort: 1;|' \ + data/entrance.conf.in \ + || die + + if use systemd ; then + sed -i \ + -e '/reboot/ s|string: .*|string: "/usr/bin/systemctl reboot";|' \ + -e '/shutdown/ s|string: .*|string: "/usr/bin/systemctl poweroff";|' \ + -e '/suspend/ s|string: .*|string: "/usr/bin/systemctl suspend";|' \ + data/entrance.conf.in \ + || die + fi + + default +} src_configure() { local emesonargs=( -Dconsolekit=false - $(meson_use systemd logind) $(meson_use nls) $(meson_use pam) + $(meson_use systemd logind) ) meson_src_configure -- cgit v1.2.3