commit: 744f19bc7964bdc0363c83b7ea0d3dc9545a037c
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 15:06:58 2016 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 15:06:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=744f19bc
x11-apps/xdm: Remove old
Package-Manager: portage-2.2.28
x11-apps/xdm/xdm-1.1.11-r1.ebuild | 67 -----------------------------------
x11-apps/xdm/xdm-1.1.11-r2.ebuild | 73 ---------------------------------------
2 files changed, 140 deletions(-)
diff --git a/x11-apps/xdm/xdm-1.1.11-r1.ebuild
b/x11-apps/xdm/xdm-1.1.11-r1.ebuild
deleted file mode 100644
index 6afee5a..0000000
--- a/x11-apps/xdm/xdm-1.1.11-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-XORG_EAUTORECONF=yes
-
-inherit multilib xorg-2 pam systemd
-
-DEFAULTVT=vt7
-
-DESCRIPTION="X.Org xdm application"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
~x86-fbsd"
-IUSE="consolekit ipv6 pam"
-
-RDEPEND="x11-apps/xrdb
- x11-libs/libXdmcp
- x11-libs/libXaw
- >=x11-apps/xinit-1.0.2-r3
- x11-libs/libXinerama
- x11-libs/libXmu
- x11-libs/libX11
- x11-libs/libXt
- x11-apps/sessreg
- x11-apps/xconsole
- consolekit? ( sys-auth/consolekit )
- pam? ( virtual/pam )
- !<sys-apps/systemd-187"
-DEPEND="${RDEPEND}
- consolekit? ( !=sys-auth/pambase-20101024-r1 )
- x11-proto/xineramaproto
- x11-proto/xproto"
-
-pkg_setup() {
- PATCHES=( "${FILESDIR}"/${PN}-consolekit.patch )
-
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable ipv6)
- $(use_with pam)
- "$(systemd_with_unitdir)"
- --with-default-vt=${DEFAULTVT}
- --with-xdmconfigdir=/etc/X11/xdm
- $(use_with consolekit)
- )
-}
-
-src_prepare() {
- # fedora invented that in -187...
- sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \
- xdm.service.in || die
-
- xorg-2_src_prepare
-}
-
-src_install() {
- xorg-2_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.11-r2.ebuild
b/x11-apps/xdm/xdm-1.1.11-r2.ebuild
deleted file mode 100644
index d20f481..0000000
--- a/x11-apps/xdm/xdm-1.1.11-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-XORG_EAUTORECONF=yes
-
-inherit multilib xorg-2 pam systemd
-
-DEFAULTVT=vt7
-
-DESCRIPTION="X.Org xdm application"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~x86-fbsd"
-IUSE="consolekit ipv6 pam"
-
-RDEPEND="x11-apps/xrdb
- x11-libs/libXdmcp
- x11-libs/libXaw
- >=x11-apps/xinit-1.0.2-r3
- x11-libs/libXinerama
- x11-libs/libXmu
- x11-libs/libX11
- x11-libs/libXt
- x11-apps/sessreg
- x11-apps/xconsole
- consolekit? ( sys-auth/consolekit )
- pam? ( virtual/pam )
- !<sys-apps/systemd-187"
-DEPEND="${RDEPEND}
- consolekit? ( !=sys-auth/pambase-20101024-r1 )
- x11-proto/xineramaproto
- x11-proto/xproto"
-
-pkg_setup() {
- PATCHES=( "${FILESDIR}"/${PN}-consolekit.patch )
-
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable ipv6)
- $(use_with pam)
- "$(systemd_with_unitdir)"
- --with-default-vt=${DEFAULTVT}
- --with-xdmconfigdir=/etc/X11/xdm
- $(use_with consolekit)
- )
-}
-
-src_prepare() {
- # fedora invented that in -187...
- sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \
- xdm.service.in || die
-
- # disable XDM-AUTHENTICATION-1 wrt 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.cpp || die
-
- xorg-2_src_prepare
-}
-
-src_install() {
- xorg-2_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
-}
