old, no internal CK support

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

7 files changed, 7 insertions, 247 deletions

diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index ee948f54cfe8..bb9f89276627 100644
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xdm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.143 2012/03/18 19:14:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.144 2012/03/19 06:09:52 ssuominen Exp $
+
+  19 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -files/0001-Fix-missing-linking-dependency-on-ldl.patch,
+  -xdm-1.1.10-r1.ebuild, -xdm-1.1.10-r2.ebuild, -xdm-1.1.11.ebuild,
+  -files/xdm.service, -files/xwilling-hang.patch:
+  old
 
   18 Mar 2012; Raúl Porcel <armin76@gentoo.org> xdm-1.1.11-r1.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #403727
diff --git a/x11-apps/xdm/files/0001-Fix-missing-linking-dependency-on-ldl.patch b/x11-apps/xdm/files/0001-Fix-missing-linking-dependency-on-ldl.patch
deleted file mode 100644
index c42b67ade5c7..000000000000
--- a/x11-apps/xdm/files/0001-Fix-missing-linking-dependency-on-ldl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4014cde16310467e8b826da77f4ca5b0ae3d357f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fernando=20Tarl=C3=A1=20Cardoso=20Lemos?=
- <fernandotcl@gmail.com>
-Date: Sat, 19 Feb 2011 17:53:08 -0200
-Subject: [PATCH] Fix missing linking dependency on -ldl.
-
-Recent versions of GCC ship with a linker that doesn't add the deps
-of the DSOs to the linking process. This behavior is also found in
-GNU gold. This change fixes building with those linkers.
-
-Some references:
-
-http://wiki.debian.org/ToolChain/DSOLinking
-https://fedoraproject.org/wiki/UnderstandingDSOLinkChange
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
----
- configure.ac |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5d0f243..d9aa26a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -455,6 +455,9 @@ AM_CONDITIONAL(HAS_XDM_AUTH, test x$xdmauth = xyes -a x$xdmauth_enable != xno)
- 
- AC_SEARCH_LIBS(crypt, crypt)
- 
-+# Function dl() comes from the C library or -ldl
-+AC_SEARCH_LIBS([dlopen], [dl])
-+
- AC_SUBST(XDM_CFLAGS)
- AC_SUBST(XDM_LIBS)
- AC_SUBST(XDM_LDFLAGS)
--- 
-1.7.6.1
-
diff --git a/x11-apps/xdm/files/xdm.service b/x11-apps/xdm/files/xdm.service
deleted file mode 100644
index 3e4b840a757b..000000000000
--- a/x11-apps/xdm/files/xdm.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=X-Window Display Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/bin/xdm -nodaemon
-
-[Install]
-Alias=graphical.target.wants/xdm.service
diff --git a/x11-apps/xdm/files/xwilling-hang.patch b/x11-apps/xdm/files/xwilling-hang.patch
deleted file mode 100644
index 93a0b14fd54a..000000000000
--- a/x11-apps/xdm/files/xwilling-hang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xdm-1.0.3.orig/config/xdm-config.cpp	2006-04-19 22:40:45.000000000 -0700
-+++ xdm-1.0.3/config/xdm-config.cpp	2006-04-19 23:10:44.000000000 -0700
-@@ -18,7 +18,7 @@
- DisplayManager.servers:		XDMCONFIGDIR/Xservers
- DisplayManager.accessFile:	XDMCONFIGDIR/Xaccess
- DisplayManager*resources:	XDMCONFIGDIR/Xresources
--DisplayManager.willing:		SU nobody -c XDMSCRIPTDIR/Xwilling
-+DisplayManager.willing:		XDMSCRIPTDIR/Xwilling
- ! All displays should use authorization, but we cannot be sure
- ! X terminals may not be configured that way, so they will require
- ! individual resource settings.
diff --git a/x11-apps/xdm/xdm-1.1.10-r1.ebuild b/x11-apps/xdm/xdm-1.1.10-r1.ebuild
deleted file mode 100644
index d76a3d2dce94..000000000000
--- a/x11-apps/xdm/xdm-1.1.10-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.10-r1.ebuild,v 1.7 2011/03/05 18:01:50 xarthisius Exp $
-
-EAPI=3
-
-inherit multilib xorg-2 pam
-
-DEFAULTVT="vt7"
-
-DESCRIPTION="X.Org xdm application"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="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
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-PATCHES=( "${FILESDIR}"/xwilling-hang.patch )
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable ipv6)
-		$(use_with pam)
-		--with-default-vt=${DEFAULTVT}
-		--with-xdmconfigdir=/etc/X11/xdm"
-}
-
-src_install() {
-	xorg-2_src_install
-	exeinto /usr/$(get_libdir)/X11/xdm
-	doexe "${FILESDIR}"/Xsession || die
-	if use pam; then
-		# Use system-local-login to get pam_loginuid and pam_ck_connector from
-		# pambase. This is required to get active ConsoleKit session since 0.4.2.
-		pamd_mimic system-local-login xdm auth account session
-	fi
-	# 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.10-r2.ebuild b/x11-apps/xdm/xdm-1.1.10-r2.ebuild
deleted file mode 100644
index efdaeacb9630..000000000000
--- a/x11-apps/xdm/xdm-1.1.10-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.10-r2.ebuild,v 1.9 2011/10/03 17:55:17 josejx Exp $
-
-EAPI=3
-
-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="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
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-PATCHES=(
-	"${FILESDIR}"/xwilling-hang.patch
-	# bug #369531 (underlinking)
-	"${FILESDIR}"/0001-Fix-missing-linking-dependency-on-ldl.patch
-)
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_with pam)
-		--with-default-vt=${DEFAULTVT}
-		--with-xdmconfigdir=/etc/X11/xdm
-	)
-}
-
-src_install() {
-	xorg-2_src_install
-	exeinto /usr/$(get_libdir)/X11/xdm
-	doexe "${FILESDIR}"/Xsession || die
-	if use pam; then
-		# Use system-local-login to get pam_loginuid and pam_ck_connector from
-		# pambase. This is required to get active ConsoleKit session since 0.4.2.
-		pamd_mimic system-local-login xdm auth account session
-	fi
-	# Keep /var/lib/xdm. This is where authfiles are stored. See #286350.
-	keepdir /var/lib/xdm
-
-	systemd_dounit "${FILESDIR}"/xdm.service || die
-}
-
-pkg_postinst() {
-	# Mea culpa, feel free to remove that after some time --mgorny.
-	if [[ -L "${ROOT}"/etc/systemd/system/graphical.target.wants/${PN}'@tty7'.service ]]
-	then
-		ebegin "Renaming ${PN}@tty7.service to ${PN}.service"
-		ln -s "${ROOT}"/lib/systemd/system/xdm.service \
-			"${ROOT}"/etc/systemd/system/graphical.target.wants/${PN}.service && \
-		rm -f "${ROOT}"/etc/systemd/system/graphical.target.wants/${PN}'@tty7'.service
-		eend ${?} \
-			"Please try to re-enable xdm.service"
-	fi
-}
diff --git a/x11-apps/xdm/xdm-1.1.11.ebuild b/x11-apps/xdm/xdm-1.1.11.ebuild
deleted file mode 100644
index 7b8e37d0c414..000000000000
--- a/x11-apps/xdm/xdm-1.1.11.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.11.ebuild,v 1.9 2012/03/03 16:26:05 ranger Exp $
-
-EAPI=3
-
-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="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
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_with pam)
-		"$(systemd_with_unitdir)"
-		--with-default-vt=${DEFAULTVT}
-		--with-xdmconfigdir=/etc/X11/xdm
-	)
-}
-
-src_install() {
-	xorg-2_src_install
-	exeinto /usr/$(get_libdir)/X11/xdm
-	doexe "${FILESDIR}"/Xsession || die
-	if use pam; then
-		# Use system-local-login to get pam_loginuid and pam_ck_connector from
-		# pambase. This is required to get active ConsoleKit session since 0.4.2.
-		pamd_mimic system-local-login xdm auth account session
-	fi
-	# Keep /var/lib/xdm. This is where authfiles are stored. See #286350.
-	keepdir /var/lib/xdm
-}
-
-pkg_postinst() {
-	# Mea culpa, feel free to remove that after some time --mgorny.
-	if [[ -L "${ROOT}"/etc/systemd/system/graphical.target.wants/${PN}'@tty7'.service ]]
-	then
-		ebegin "Renaming ${PN}@tty7.service to ${PN}.service"
-		ln -s "${ROOT}"/lib/systemd/system/xdm.service \
-			"${ROOT}"/etc/systemd/system/graphical.target.wants/${PN}.service && \
-		rm -f "${ROOT}"/etc/systemd/system/graphical.target.wants/${PN}'@tty7'.service
-		eend ${?} \
-			"Please try to re-enable xdm.service"
-	fi
-}