Drop redundant.

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

3 files changed, 5 insertions, 108 deletions

diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index 2c663793d2bf..7fee54f2c24b 100644
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xdm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.110 2011/02/09 13:12:09 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.111 2011/02/10 11:49:25 scarabeus Exp $
+
+  10 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> -xdm-1.1.9.ebuild,
+  -xdm-1.1.10.ebuild:
+  Drop redundant.
 
   09 Feb 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> xdm-1.1.10-r1.ebuild:
   x86 stable wrt bug #353487
diff --git a/x11-apps/xdm/xdm-1.1.10.ebuild b/x11-apps/xdm/xdm-1.1.10.ebuild
deleted file mode 100644
index 02f580d16f36..000000000000
--- a/x11-apps/xdm/xdm-1.1.10.ebuild
+++ /dev/null
@@ -1,49 +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.ebuild,v 1.2 2011/01/16 22:38:18 mgorny 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
-		newpamd "${FILESDIR}"/xdm.pamd xdm || die
-	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.9.ebuild b/x11-apps/xdm/xdm-1.1.9.ebuild
deleted file mode 100644
index b8292e2c46b9..000000000000
--- a/x11-apps/xdm/xdm-1.1.9.ebuild
+++ /dev/null
@@ -1,58 +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.9.ebuild,v 1.9 2011/01/16 22:38:18 mgorny Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit multilib x-modular 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/libX11
-	x11-libs/libXt
-	x11-apps/sessreg
-	x11-apps/xconsole
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-PATCHES=( "${FILESDIR}"/wtmp.patch
-	"${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() {
-	x-modular_src_install
-	exeinto /usr/$(get_libdir)/X11/xdm
-	doexe "${FILESDIR}"/Xsession
-	newpamd "${FILESDIR}"/xdm.pamd xdm
-	# Keep /var/lib/xdm. This is where authfiles are stored. See #286350.
-	keepdir /var/lib/xdm
-}
-
-pkg_preinst() {
-	x-modular_pkg_preinst
-
-	# Check for leftover /usr/lib/X11/xdm symlink
-	if [[ -L "/usr/lib/X11/xdm" ]]; then
-		ewarn "/usr/lib/X11/xdm is a symlink; deleting."
-		rm /usr/lib/X11/xdm
-	fi
-}