Drop redundant.

Package-Manager: portage-2.2.0_alpha23/cvs/Linux x86_64

4 files changed, 6 insertions, 112 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/Manifest b/x11-apps/xdm/Manifest
index f978233c879d..342e04add2a4 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -4,10 +4,7 @@ AUX xdm.pamd 169 RMD160 3966ca34d9600db06be7e672b66b0ae23c8e9282 SHA1 48e97b23ae
 AUX xwilling-hang.patch 589 RMD160 1c624acd002d4b45cf6fb318ab4010425120c09b SHA1 df9d176961a1a84da2ee94667fb601634268c923 SHA256 7ee42e52cf2e2aedba74daabee0bb2fa4648262eb00dc92bc778c61b9afb59f4
 DIST xdm-1.1.10.tar.bz2 423578 RMD160 c5f6b3bba2d1294b560ad50e2eaaa90097c62dee SHA1 45eb013aa14ddd8d385b200b94fb0fbcbe09b860 SHA256 1487f7168e65fb7ea8cf21e99cdec412e643680c5dac9688aad5f87beba4f97f
 DIST xdm-1.1.8.tar.bz2 401712 RMD160 5435ff73a8fea36ecb071462121308f828d47927 SHA1 619d810d9cd60e193be72365791cdb4057fc56ce SHA256 e1169058775a44b0898351d2f645039b4d8946360285831e553587a147b735e9
-DIST xdm-1.1.9.tar.bz2 425348 RMD160 4a80e19ad1af6d3c61f3e10c3d2719c4811418d9 SHA1 ea0ee2923999d54848dc8a165867ffa7c628fd7b SHA256 e7b1db0e1b0d0113a301d94e40b0314e55f7e0006415f50a9cf06f636b11b134
 EBUILD xdm-1.1.10-r1.ebuild 1323 RMD160 cff5b747b6613c58e3733f968e01e81b79e42031 SHA1 75e5899f4270ae373993f82056c1df613397abe8 SHA256 260be15b034a25c372f8cec277e582d8bb5068355b6d439c5c18c8adfbf10850
-EBUILD xdm-1.1.10.ebuild 1155 RMD160 0b5543cef167957ff41a5d410ddb5e5a02e49b44 SHA1 20d98479524056c9688a263eae951c3a6e8a89fd SHA256 b1d53cf922e0d6ba3e9da0eb10a9ead7e2764844ecfbe67edb5505b0e82bbc18
 EBUILD xdm-1.1.8.ebuild 1309 RMD160 3b4504a0d415fb11b2d909baecdb48f7996930db SHA1 94a48039a4e0c19fc45ef8fd7965ce01860cbcac SHA256 48e6fd580984ddae35c016eddc9b904ddbc46e376fdfc7896dace9ef901f4080
-EBUILD xdm-1.1.9.ebuild 1383 RMD160 57fbdd01f84d1b246155cad747f885c367d42430 SHA1 44c108d6a8323c284b8b0a86cffbffe654abc57a SHA256 d851c130f5b1cdbce005e3bf9e4ce003d684d99290ef5ecc8cac1cf256ad52fd
-MISC ChangeLog 16296 RMD160 ed508b8109a3c6433b73cad831e78c201625763f SHA1 2c13b5289bedf6b5e9aeb37f05bc189ac2be86b3 SHA256 20fd45873c72d3a3efb340361ffd19a497d6006059eac846e59f224e596b94c9
+MISC ChangeLog 16410 RMD160 1421899c87d451c2d2d4f74f8d11c7746f76401e SHA1 f3bcee7b22fb28522295be6fdfa0f2f2401cf9b4 SHA256 dcb273b0ce3add025352bf9212048370231760658aef89a9d99ef5c56d527d78
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
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
-}