From b4d43e8c611df4a8061b6f88d9e9f6b1e3c83903 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Jun 2021 14:47:38 +0100 Subject: gentoo resync : 24.06.2021 --- x11-apps/xdm/Manifest | 2 +- x11-apps/xdm/xdm-1.1.12-r1.ebuild | 83 +++++++++++++++++++++++++++++++++++++++ x11-apps/xdm/xdm-1.1.12.ebuild | 82 -------------------------------------- 3 files changed, 84 insertions(+), 83 deletions(-) create mode 100644 x11-apps/xdm/xdm-1.1.12-r1.ebuild delete mode 100644 x11-apps/xdm/xdm-1.1.12.ebuild (limited to 'x11-apps/xdm') diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest index 255d58d86b89..cc262a2a7627 100644 --- a/x11-apps/xdm/Manifest +++ b/x11-apps/xdm/Manifest @@ -2,5 +2,5 @@ AUX Xsession 1521 BLAKE2B cb2090c2f2c1626df08fe45e80ab668ec9ca43f8f647f9a16d09e7 AUX xdm-1.1.12-consolekit.patch 7815 BLAKE2B 1ef67b15385c3cc9a74797fadc34e5701889bf669f70e9c3720a82db595472dcf8fc36011ce35cad763dc68580a7680a272c7617d9cf58db8314f788974031cd SHA512 e318ebe0e606964712db40cb70177d4aa275679ef6e2c0ca97cd5156434d037e8774bc75dad3584e8d13ad4577798fac6624bdb6359f1a57de9eb2961bfdc5f7 AUX xdm-1.1.12-make-xinerama-optional.patch 978 BLAKE2B feb81c4815c61c62ebd25acec572de03450c4ee5fd7a634cb0444e17d35566548c0bc8dab05562264533676012410839f61b2e5cb5bc98d83bf9a36daa1b59cc SHA512 efddf2cd662cc4e1ca5cea2a9efe49b4ef8e98276f37def047091088a9deaaadc61646deeefbd8668286d08edabd245a532db84ddf938a2853bdcc1865c221c9 DIST xdm-1.1.12.tar.bz2 512074 BLAKE2B a82d124f4b7ce3185d703fca3aade92e86094602aec5343566ba8c91c54b70cdedbaea2fa6fee330d7ed48d9138b04a998aa2dae06db2683bfcce6c7693edc82 SHA512 1a4be0a070ced5db8fda6fc74794c9f9ed0cb37fa440fda6a3a7652aff62dfc3d7ba68b9facf054671ebf0f4db2a0eec29d0aa3716e3407ccd5529bac3553bdb -EBUILD xdm-1.1.12.ebuild 1864 BLAKE2B 00b3edc97b4458220695884f4dd7aeac3c1bfae669be6ffeea16fb88590e8d75dfb94432e2a251eebcbe1a99389c212c2b2f126e9eac07b213156e091b7d1e4b SHA512 ccdee8ce70dee024b700584623f939f334a29887240f9b2d80bc4ef7b4c2dee35211e8f8f5c5b3a4b0f26dc9d4dfab19059226e73aa3b320b0e759d215fbf6c6 +EBUILD xdm-1.1.12-r1.ebuild 1884 BLAKE2B 80f8fb5c15424cce88256c8af5c5f9054d32d2a8d72c7aa4afd8ea3dae84f4497c5142a76d2014c8a23e2978285a63dd407158e3310926ff24563c3abae111a5 SHA512 8642812a6ea7c75f431e7eb41eabf0f7eb8c4c2208acfcb1d641d8dd7abbce523260473f402af12fda1b1e26cf00b95a336050b3ce02ca0c550e0501d961d177 MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1 diff --git a/x11-apps/xdm/xdm-1.1.12-r1.ebuild b/x11-apps/xdm/xdm-1.1.12-r1.ebuild new file mode 100644 index 000000000000..710112c9b7eb --- /dev/null +++ b/x11-apps/xdm/xdm-1.1.12-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +XORG_EAUTORECONF=yes + +inherit xorg-3 pam systemd + +DEFAULTVT=vt7 + +DESCRIPTION="X.Org xdm application" + +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" +IUSE="ipv6 pam systemd truetype xinerama xpm" + +RDEPEND=" + x11-apps/sessreg + x11-apps/xconsole + x11-apps/xinit + x11-apps/xrdb + x11-apps/xsm + x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXdmcp + x11-libs/libXmu + x11-libs/libXt + virtual/libcrypt:= + pam? ( sys-libs/pam ) + systemd? ( >=sys-apps/systemd-209 ) + truetype? ( + x11-libs/libXrender + x11-libs/libXft + ) + xinerama? ( x11-libs/libXinerama ) + xpm? ( x11-libs/libXpm ) + elibc_glibc? ( dev-libs/libbsd )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +src_prepare() { + local PATCHES=( + "${FILESDIR}"/${P}-consolekit.patch # bug 747124 + "${FILESDIR}"/${P}-make-xinerama-optional.patch + ) + + 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) + $(use_with truetype xft) + $(use_with xinerama) + $(use_enable xpm xpm-logos) + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + --with-default-vt=${DEFAULTVT} + --with-xdmconfigdir=/etc/X11/xdm + ) + xorg-3_src_configure +} + +src_install() { + xorg-3_src_install + + exeinto /usr/$(get_libdir)/X11/xdm + doexe "${FILESDIR}"/Xsession + + use pam && pamd_mimic system-local-login xdm auth account session + + # Keep /var/lib/xdm. This is where authfiles are stored. See #286350. + keepdir /var/lib/xdm +} diff --git a/x11-apps/xdm/xdm-1.1.12.ebuild b/x11-apps/xdm/xdm-1.1.12.ebuild deleted file mode 100644 index 1199ae27622a..000000000000 --- a/x11-apps/xdm/xdm-1.1.12.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_EAUTORECONF=yes - -inherit xorg-3 pam systemd - -DEFAULTVT=vt7 - -DESCRIPTION="X.Org xdm application" - -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -IUSE="ipv6 pam systemd truetype xinerama xpm" - -RDEPEND=" - x11-apps/sessreg - x11-apps/xconsole - x11-apps/xinit - x11-apps/xrdb - x11-apps/xsm - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXdmcp - x11-libs/libXmu - x11-libs/libXt - pam? ( sys-libs/pam ) - systemd? ( >=sys-apps/systemd-209 ) - truetype? ( - x11-libs/libXrender - x11-libs/libXft - ) - xinerama? ( x11-libs/libXinerama ) - xpm? ( x11-libs/libXpm ) - elibc_glibc? ( dev-libs/libbsd )" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -src_prepare() { - local PATCHES=( - "${FILESDIR}"/${P}-consolekit.patch # bug 747124 - "${FILESDIR}"/${P}-make-xinerama-optional.patch - ) - - 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) - $(use_with truetype xft) - $(use_with xinerama) - $(use_enable xpm xpm-logos) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - --with-default-vt=${DEFAULTVT} - --with-xdmconfigdir=/etc/X11/xdm - ) - xorg-3_src_configure -} - -src_install() { - xorg-3_src_install - - exeinto /usr/$(get_libdir)/X11/xdm - doexe "${FILESDIR}"/Xsession - - use pam && pamd_mimic system-local-login xdm auth account session - - # Keep /var/lib/xdm. This is where authfiles are stored. See #286350. - keepdir /var/lib/xdm -} -- cgit v1.2.3