diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2021-04-04 22:03:01 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2021-04-04 22:03:01 -0400 |
| commit | 754e286bf1a5fdd6cf9d6be4cbbb3779dbd7559b (patch) | |
| tree | 3141f631e06bbad54195805b72b0de9d7c5873d6 /x11-apps/xdm | |
| parent | sys-devel/bin86: maintainer needed (diff) | |
| download | gentoo-754e286bf1a5fdd6cf9d6be4cbbb3779dbd7559b.tar.gz gentoo-754e286bf1a5fdd6cf9d6be4cbbb3779dbd7559b.tar.bz2 gentoo-754e286bf1a5fdd6cf9d6be4cbbb3779dbd7559b.zip | |
x11-apps/xdm: avoid using FILESDIR in pkg_setup
Defining PATCHES and configure flags in pkg_setup is weird.
Move them to src_prepare and src_configure, respectively.
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'x11-apps/xdm')
| -rw-r--r-- | x11-apps/xdm/xdm-1.1.12.ebuild | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/x11-apps/xdm/xdm-1.1.12.ebuild b/x11-apps/xdm/xdm-1.1.12.ebuild index 5f1478118b56..1199ae27622a 100644 --- a/x11-apps/xdm/xdm-1.1.12.ebuild +++ b/x11-apps/xdm/xdm-1.1.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -37,13 +37,25 @@ RDEPEND=" DEPEND="${RDEPEND} x11-base/xorg-proto" -pkg_setup() { - PATCHES=( +src_prepare() { + local PATCHES=( "${FILESDIR}"/${P}-consolekit.patch # bug 747124 "${FILESDIR}"/${P}-make-xinerama-optional.patch ) - XORG_CONFIGURE_OPTIONS=( + sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \ + xdm.service.in || die + + # Disable XDM-AUTHORIZATION-1 (bug #445662). + # it causes issue with libreoffice and SDL games (bug #306223). + sed -i -e '/authorize/a DisplayManager*authName: MIT-MAGIC-COOKIE-1' \ + config/xdm-config.in || die + + xorg-3_src_prepare +} + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( $(use_enable ipv6) $(use_with pam) $(use_with systemd systemd-daemon) @@ -54,18 +66,7 @@ pkg_setup() { --with-default-vt=${DEFAULTVT} --with-xdmconfigdir=/etc/X11/xdm ) -} - -src_prepare() { - sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \ - xdm.service.in || die - - # Disable XDM-AUTHORIZATION-1 (bug #445662). - # it causes issue with libreoffice and SDL games (bug #306223). - sed -i -e '/authorize/a DisplayManager*authName: MIT-MAGIC-COOKIE-1' \ - config/xdm-config.in || die - - xorg-3_src_prepare + xorg-3_src_configure } src_install() { |