fix segfault if no TERM is given, bug #67530

13 files changed, 58 insertions, 405 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index b2cae95606b4..5d68f574fedc 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/mc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.66 2004/11/03 20:42:08 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.67 2004/11/17 13:48:26 lanius Exp $
+
+*mc-4.6.0-r12 (17 Nov 2004)
+
+  17 Nov 2004; <heino@gentoo.org> -mc-4.5.55-r7.ebuild, -mc-4.6.0-r10.ebuild,
+  +mc-4.6.0-r12.ebuild, -mc-4.6.0-r5.ebuild, -mc-4.6.0-r7.ebuild,
+  -mc-4.6.0-r9.ebuild:
+  fix segfault if no TERM is given, bug #67530
 
   03 Nov 2004; Markus Rothe <corsair@gentoo.org> mc-4.6.0-r11.ebuild:
   Stable on ppc64
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 8916103e0546..8f4e3c2d6f28 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,25 +1,18 @@
-MD5 04bb72ee0d8357ae6beb6d211a27252b ChangeLog 10324
-MD5 f79a9b6d20e503ceb2011fabdf31cf30 mc-4.5.55-r7.ebuild 1869
-MD5 9afea49a34ebefc50dc32e6a40e14677 mc-4.6.0-r10.ebuild 2633
 MD5 1361bbda69bdfac3c9b39e1d0fb523c8 mc-4.6.0-r11.ebuild 2995
-MD5 f354988cbbb82187fa4eb1978def6903 mc-4.6.0-r5.ebuild 2573
-MD5 68e939d27f9f33357a9feb3eebc760f5 mc-4.6.0-r7.ebuild 2665
-MD5 e4db592c8c109e0516c58bddef89fb72 mc-4.6.0-r9.ebuild 2608
+MD5 d045f5f2346f5ca1328363acd39cc9cd mc-4.6.0-r12.ebuild 3032
+MD5 04bb72ee0d8357ae6beb6d211a27252b ChangeLog 10324
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
-MD5 9f528fa7b6b4d2c202ce5f4e3a5173ba files/chdir-4.6.0.gentoo 159
-MD5 d8853d9a555c715676945a15c98030c1 files/digest-mc-4.5.55-r7 125
-MD5 d576baf06c64df107664f4724b7632a2 files/digest-mc-4.6.0-r10 139
+MD5 b07d2f1ccf2c5b607caaeaa82ad1681e files/mc-4.6.0-key.c.patch 811
+MD5 169bb0ff53b2a9c5271503bbcbccf3df files/mc-4.6.0-find.patch 5798
+MD5 6356abe34b8907ad2cfedd4cf8ef365e files/mc-4.6.0-ebuild-syntax.patch 296
+MD5 4df4331a2db0f5e9c0f2c0c9bb683fc3 files/mc-4.6.0-vfs.patch 336
 MD5 d576baf06c64df107664f4724b7632a2 files/digest-mc-4.6.0-r11 139
-MD5 042fefdf0b2c229a62b4e18200099389 files/digest-mc-4.6.0-r5 214
-MD5 042fefdf0b2c229a62b4e18200099389 files/digest-mc-4.6.0-r7 214
-MD5 d576baf06c64df107664f4724b7632a2 files/digest-mc-4.6.0-r9 139
-MD5 33aafc4a9c8134eb13d62fed6b81888e files/ebuild.syntax 2588
+MD5 d576baf06c64df107664f4724b7632a2 files/digest-mc-4.6.0-r12 139
 MD5 23a5069637af088015fe5f0de8c42883 files/mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
+MD5 835695dda387b59a2497658f3f5af1d5 files/mc.gentoo 322
+MD5 9f528fa7b6b4d2c202ce5f4e3a5173ba files/chdir-4.6.0.gentoo 159
+MD5 3f426ce18f8bf82d9e9c3347525d75e8 files/mc-4.6.0-utf8.patch.bz2 30359
+MD5 3bb3f2fa14fdb654e1352bdd406d848f files/mc-4.6.0-largefile.patch 5751
 MD5 2a6c3ed30597eadaa19a6dbdd3ce168d files/mc-4.6.0-cpan-2003-1023.patch 475
-MD5 6356abe34b8907ad2cfedd4cf8ef365e files/mc-4.6.0-ebuild-syntax.patch 296
-MD5 169bb0ff53b2a9c5271503bbcbccf3df files/mc-4.6.0-find.patch 5798
+MD5 33aafc4a9c8134eb13d62fed6b81888e files/ebuild.syntax 2588
 MD5 99fd5760d0ddfc08292de6a62b573e73 files/mc-4.6.0-ftp.patch 285
-MD5 3bb3f2fa14fdb654e1352bdd406d848f files/mc-4.6.0-largefile.patch 5751
-MD5 3f426ce18f8bf82d9e9c3347525d75e8 files/mc-4.6.0-utf8.patch.bz2 30359
-MD5 4df4331a2db0f5e9c0f2c0c9bb683fc3 files/mc-4.6.0-vfs.patch 336
-MD5 835695dda387b59a2497658f3f5af1d5 files/mc.gentoo 322
diff --git a/app-misc/mc/files/digest-mc-4.5.55-r7 b/app-misc/mc/files/digest-mc-4.5.55-r7
deleted file mode 100644
index 4c1f53fe4b3d..000000000000
--- a/app-misc/mc/files/digest-mc-4.5.55-r7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ed438718a4f6fd986252f5ebfcce8ed1 /mc-4.5.55-r7.ebuild 2037
-MD5 bb670d48589f26f00b7fce8d25f66bd6 mc-4.5.55.tar.gz 4849958
diff --git a/app-misc/mc/files/digest-mc-4.6.0-r10 b/app-misc/mc/files/digest-mc-4.6.0-r12
index c66b6aee0770..c66b6aee0770 100644
--- a/app-misc/mc/files/digest-mc-4.6.0-r10
+++ b/app-misc/mc/files/digest-mc-4.6.0-r12
diff --git a/app-misc/mc/files/digest-mc-4.6.0-r5 b/app-misc/mc/files/digest-mc-4.6.0-r5
deleted file mode 100644
index 82c87e399f3e..000000000000
--- a/app-misc/mc/files/digest-mc-4.6.0-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676
-MD5 f5053361d1936b3e4187857daf0cc6cb mc-4.6.0-sambalib-3.0.0-r1.patch.bz2 399920
-MD5 3378ef7b8f4029f7aa4ee6944694cf1f mc-4.6.0-sambalib.patch.bz2 337051
diff --git a/app-misc/mc/files/digest-mc-4.6.0-r7 b/app-misc/mc/files/digest-mc-4.6.0-r7
deleted file mode 100644
index 82c87e399f3e..000000000000
--- a/app-misc/mc/files/digest-mc-4.6.0-r7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676
-MD5 f5053361d1936b3e4187857daf0cc6cb mc-4.6.0-sambalib-3.0.0-r1.patch.bz2 399920
-MD5 3378ef7b8f4029f7aa4ee6944694cf1f mc-4.6.0-sambalib.patch.bz2 337051
diff --git a/app-misc/mc/files/digest-mc-4.6.0-r9 b/app-misc/mc/files/digest-mc-4.6.0-r9
deleted file mode 100644
index c66b6aee0770..000000000000
--- a/app-misc/mc/files/digest-mc-4.6.0-r9
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676
-MD5 f5053361d1936b3e4187857daf0cc6cb mc-4.6.0-sambalib-3.0.0.patch.bz2 399920
diff --git a/app-misc/mc/files/mc-4.6.0-key.c.patch b/app-misc/mc/files/mc-4.6.0-key.c.patch
new file mode 100644
index 000000000000..351db2acdd1c
--- /dev/null
+++ b/app-misc/mc/files/mc-4.6.0-key.c.patch
@@ -0,0 +1,20 @@
+--- src/key.c.org	2004-11-17 14:37:22.887315224 +0100
++++ src/key.c	2004-11-17 14:37:57.656029576 +0100
+@@ -262,7 +262,7 @@
+     define_sequences (mc_default_keys);
+     
+     /* Terminfo on irix does not have some keys */
+-    if ((!strncmp (term, "iris-ansi", 9)) || (!strncmp (term, "xterm", 5)))
++    if (term && (!strncmp (term, "iris-ansi", 9)) || (!strncmp (term, "xterm", 5)))
+ 	define_sequences (xterm_key_defines);
+     
+     define_sequences (mc_bindings);
+@@ -271,7 +271,7 @@
+     load_xtra_key_defines();
+     
+ #ifdef __QNX__
+-    if (strncmp(term, "qnx", 3) == 0){
++    if (term && strncmp(term, "qnx", 3) == 0){
+ 	/* Modify the default value of use_8th_bit_as_meta: we would
+ 	 * like to provide a working mc for a newbie who knows nothing
+ 	 * about [Options|Display bits|Full 8 bits input]...
diff --git a/app-misc/mc/mc-4.5.55-r7.ebuild b/app-misc/mc/mc-4.5.55-r7.ebuild
deleted file mode 100644
index 04f7c0612062..000000000000
--- a/app-misc/mc/mc-4.5.55-r7.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.5.55-r7.ebuild,v 1.10 2004/06/28 03:59:06 vapier Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="GNU Midnight Commander"
-HOMEPAGE="http://www.ibiblio.org/mc/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~alpha ~mips ~hppa"
-IUSE="gpm nls samba ncurses X pam slang"
-
-DEPEND=">=sys-fs/e2fsprogs-1.19
-	=dev-libs/glib-1.2*
-	>=sys-devel/automake-1.5d-r1
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	pam? ( >=sys-libs/pam-0.72 )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	slang? ( >=sys-libs/slang-1.4.2 )
-	nls? ( sys-devel/gettext )
-	samba? ( >=net-fs/samba-2.2.3a-r1 )
-	X? ( virtual/x11 )"
-
-src_compile() {
-	filter-flags -malign-double
-
-	local myconf=""
-
-	myconf="${myconf} `use_with pam`"
-
-	use ncurses \
-		&& myconf="${myconf} --with-ncurses" \
-		|| ( use slang && myconf="${myconf} --with-slang" \
-		|| myconf="${myconf} --with-included-slang" )
-
-	use gpm \
-		&& myconf="${myconf} --with-gpm-mouse=/usr" \
-		|| myconf="${myconf} --without-gpm-mouse"
-
-	myconf="${myconf} `use_with X tm-x-support`"
-
-	use samba \
-		&& myconf="${myconf} --with-samba" \
-		&& ( \
-		    cd ${S}/vfs
-		    cp smbfs.c smbfs.c.orig
-		    sed -e "s:/etc/smb\.conf:/etc/samba/smb\.conf:" smbfs.c.orig > smbfs.c
-		    cd samba
-		    cp Makefile.in Makefile.in.orig
-		    sed -e 's:$(LIBDIR)\(/codepages\):/var/lib/samba\1:' \
-			Makefile.in.orig > Makefile.in )
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	cd ${S}
-	libtoolize --force --copy
-	aclocal -I ${S}/macros
-	automake --add-missing
-
-	econf \
-		--with-vfs \
-		--with-netrc \
-		--with-ext2undel \
-		--without-gnome \
-		${myconf} || die
-	make || die
-}
-
-src_install() {
-	einstall || die
-	dodoc FAQ INSTALL* NEWS README*
-}
diff --git a/app-misc/mc/mc-4.6.0-r10.ebuild b/app-misc/mc/mc-4.6.0-r12.ebuild
index bf8b614fb9a9..20bc02248764 100644
--- a/app-misc/mc/mc-4.6.0-r10.ebuild
+++ b/app-misc/mc/mc-4.6.0-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r10.ebuild,v 1.7 2004/10/05 13:34:51 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r12.ebuild,v 1.1 2004/11/17 13:48:26 lanius Exp $
 
 inherit flag-o-matic eutils
 
@@ -11,18 +11,19 @@ SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/managers/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ia64 x86 ppc sparc alpha ~mips hppa ~amd64 ppc64"
-IUSE="gpm nls samba ncurses X slang"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="gpm nls samba ncurses X slang unicode"
 
 PROVIDE="virtual/editor"
 
 DEPEND=">=sys-fs/e2fsprogs-1.19
 	ncurses? ( >=sys-libs/ncurses-5.2-r5 )
 	=dev-libs/glib-2*
-	>=sys-libs/pam-0.72
+	pam? ( >=sys-libs/pam-0.72 )
 	gpm? ( >=sys-libs/gpm-1.19.3 )
-	slang? ( >=sys-libs/slang-1.4.2 )
+	slang? ( >=sys-libs/slang-1.4.9-r1 )
 	samba? ( >=net-fs/samba-3.0.0 )
+	unicode? ( >=sys-libs/slang-1.4.9-r1 )
 	X? ( virtual/x11 )"
 
 src_unpack() {
@@ -36,9 +37,16 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-can-2004-0226-0231-0232.patch.bz2
 	epatch ${FILESDIR}/${P}-vfs.patch
 	epatch ${FILESDIR}/${P}-ftp.patch
+	epatch ${FILESDIR}/${P}-largefile.patch
+	epatch ${FILESDIR}/${P}-key.c.patch
+
+	if use unicode && use slang; then
+		epatch ${FILESDIR}/${P}-utf8.patch.bz2
+	fi
 }
 
 src_compile() {
+	append-flags -I/usr/include/gssapi
 	filter-flags -malign-double
 
 	local myconf=""
@@ -88,6 +96,11 @@ src_install() {
 
 	insinto /usr/share/mc
 	doins ${FILESDIR}/mc.gentoo
+
+	insinto /usr/share/mc/syntax
+	doins ${FILESDIR}/ebuild.syntax
+	cd ${D}/usr/share/mc/syntax
+	epatch ${FILESDIR}/${P}-ebuild-syntax.patch
 }
 
 pkg_postinst() {
diff --git a/app-misc/mc/mc-4.6.0-r5.ebuild b/app-misc/mc/mc-4.6.0-r5.ebuild
deleted file mode 100644
index 7f7ff9ffa6c1..000000000000
--- a/app-misc/mc/mc-4.6.0-r5.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r5.ebuild,v 1.5 2004/06/24 22:23:42 agriffis Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="GNU Midnight Commander cli-based file manager"
-HOMEPAGE="http://www.ibiblio.org/mc/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/managers/${PN}/${P}.tar.gz
-	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib-3.0.0-r1.patch.bz2
-	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ia64 x86 ppc sparc alpha mips hppa amd64"
-IUSE="gpm nls samba ncurses X slang"
-
-DEPEND=">=sys-fs/e2fsprogs-1.19
-	ncurses? ( >=sys-libs/ncurses-5.2-r5 )
-	=dev-libs/glib-2*
-	>=sys-libs/pam-0.72
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	slang? ( >=sys-libs/slang-1.4.2 )
-	samba? ( net-fs/samba )
-	X? ( virtual/x11 )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	has_version '>=net-fs/samba-3.0.0' \
-		&& epatch ${DISTDIR}/${P}-sambalib-3.0.0-r1.patch.bz2
-	has_version '<net-fs/samba-3.0.0' \
-		&& epatch ${DISTDIR}/${P}-sambalib.patch.bz2
-
-	epatch ${FILESDIR}/${P}-find.patch
-	epatch ${FILESDIR}/${P}-cpan-2003-1023.patch
-}
-
-src_compile() {
-	filter-flags -malign-double
-
-	local myconf=""
-
-	if ! use slang && ! use ncurses ; then
-		myconf="${myconf} --with-screen=mcslang"
-	elif use ncurses && ! use slang ; then
-		myconf="${myconf} --with-screen=ncurses"
-	else
-		use slang && myconf="${myconf} --with-screen=slang"
-	fi
-
-	myconf="${myconf} `use_with gpm gpm-mouse`"
-
-	use nls \
-	    && myconf="${myconf} --with-included-gettext" \
-	    || myconf="${myconf} --disable-nls"
-
-	myconf="${myconf} `use_with X x`"
-
-	use samba \
-	    && myconf="${myconf} --with-samba --with-configdir=/etc/samba
-				--with-codepagedir=/var/lib/samba/codepages --with-privatedir=/etc/samba/private" \
-	    || myconf="${myconf} --without-samba"
-
-	econf \
-	    --with-vfs \
-	    --with-gnu-ld \
-	    --with-ext2undel \
-	    --with-edit \
-		--enable-charset \
-	    ${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	 cat ${FILESDIR}/chdir-4.6.0.gentoo >>\
-		 ${S}/lib/mc-wrapper.sh
-
-	einstall || die
-
-	dodoc ChangeLog AUTHORS MAINTAINERS FAQ INSTALL* NEWS README*
-
-	insinto /usr/share/mc
-	doins ${FILESDIR}/mc.gentoo
-}
-
-pkg_postinst() {
-	einfo "Add the following line to your ~/.bashrc to"
-	einfo "allow mc to chdir to its latest working dir at exit"
-	einfo ""
-	einfo "# Midnight Commander chdir enhancement"
-	einfo "if [ -f /usr/share/mc/mc.gentoo ]; then"
-	einfo "	. /usr/share/mc/mc.gentoo"
-	einfo "fi"
-}
diff --git a/app-misc/mc/mc-4.6.0-r7.ebuild b/app-misc/mc/mc-4.6.0-r7.ebuild
deleted file mode 100644
index 2bba8536eb80..000000000000
--- a/app-misc/mc/mc-4.6.0-r7.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r7.ebuild,v 1.9 2004/09/23 04:42:50 vapier Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="GNU Midnight Commander cli-based file manager"
-HOMEPAGE="http://www.ibiblio.org/mc/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/managers/${PN}/${P}.tar.gz
-	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib-3.0.0-r1.patch.bz2
-	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc sparc x86"
-IUSE="gpm nls samba ncurses X slang"
-
-DEPEND=">=sys-fs/e2fsprogs-1.19
-	ncurses? ( >=sys-libs/ncurses-5.2-r5 )
-	=dev-libs/glib-2*
-	>=sys-libs/pam-0.72
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	slang? ( >=sys-libs/slang-1.4.2 )
-	samba? ( net-fs/samba )
-	X? ( virtual/x11 )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	has_version '>=net-fs/samba-3.0.0' \
-		&& epatch ${DISTDIR}/${P}-sambalib-3.0.0-r1.patch.bz2
-	has_version '<net-fs/samba-3.0.0' \
-		&& epatch ${DISTDIR}/${P}-sambalib.patch.bz2
-
-	epatch ${FILESDIR}/${P}-find.patch
-	epatch ${FILESDIR}/${P}-cpan-2003-1023.patch
-	epatch ${FILESDIR}/${P}-can-2004-0226-0231-0232.patch.bz2
-	epatch ${FILESDIR}/${P}-vfs.patch
-}
-
-src_compile() {
-	filter-flags -malign-double
-
-	local myconf=""
-
-	if ! use slang && ! use ncurses ; then
-		myconf="${myconf} --with-screen=mcslang"
-	elif use ncurses && ! use slang ; then
-		myconf="${myconf} --with-screen=ncurses"
-	else
-		use slang && myconf="${myconf} --with-screen=slang"
-	fi
-
-	myconf="${myconf} `use_with gpm gpm-mouse`"
-
-	use nls \
-	    && myconf="${myconf} --with-included-gettext" \
-	    || myconf="${myconf} --disable-nls"
-
-	myconf="${myconf} `use_with X x`"
-
-	use samba \
-	    && myconf="${myconf} --with-samba --with-configdir=/etc/samba
-				--with-codepagedir=/var/lib/samba/codepages --with-privatedir=/etc/samba/private" \
-	    || myconf="${myconf} --without-samba"
-
-	econf \
-	    --with-vfs \
-	    --with-gnu-ld \
-	    --with-ext2undel \
-	    --with-edit \
-		--enable-charset \
-	    ${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	 cat ${FILESDIR}/chdir-4.6.0.gentoo >>\
-		 ${S}/lib/mc-wrapper.sh
-
-	einstall || die
-
-	dodoc ChangeLog AUTHORS MAINTAINERS FAQ INSTALL* NEWS README*
-
-	insinto /usr/share/mc
-	doins ${FILESDIR}/mc.gentoo
-}
-
-pkg_postinst() {
-	einfo "Add the following line to your ~/.bashrc to"
-	einfo "allow mc to chdir to its latest working dir at exit"
-	einfo ""
-	einfo "# Midnight Commander chdir enhancement"
-	einfo "if [ -f /usr/share/mc/mc.gentoo ]; then"
-	einfo "	. /usr/share/mc/mc.gentoo"
-	einfo "fi"
-}
diff --git a/app-misc/mc/mc-4.6.0-r9.ebuild b/app-misc/mc/mc-4.6.0-r9.ebuild
deleted file mode 100644
index 6ef100c3a48c..000000000000
--- a/app-misc/mc/mc-4.6.0-r9.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r9.ebuild,v 1.5 2004/10/19 09:46:47 absinthe Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="GNU Midnight Commander cli-based file manager"
-HOMEPAGE="http://www.ibiblio.org/mc/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/managers/${PN}/${P}.tar.gz
-	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib-3.0.0.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ia64 x86 ppc ~sparc ~alpha ~mips ~hppa amd64 ppc64"
-IUSE="gpm nls samba ncurses X slang"
-
-DEPEND=">=sys-fs/e2fsprogs-1.19
-	ncurses? ( >=sys-libs/ncurses-5.2-r5 )
-	=dev-libs/glib-2*
-	>=sys-libs/pam-0.72
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	slang? ( >=sys-libs/slang-1.4.2 )
-	samba? ( >=net-fs/samba-3.0.0 )
-	X? ( virtual/x11 )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	epatch ${DISTDIR}/${P}-sambalib-3.0.0.patch.bz2
-
-	epatch ${FILESDIR}/${P}-find.patch
-	epatch ${FILESDIR}/${P}-cpan-2003-1023.patch
-	epatch ${FILESDIR}/${P}-can-2004-0226-0231-0232.patch.bz2
-	epatch ${FILESDIR}/${P}-vfs.patch
-	epatch ${FILESDIR}/${P}-ftp.patch
-}
-
-src_compile() {
-	filter-flags -malign-double
-
-	local myconf=""
-
-	if ! use slang && ! use ncurses ; then
-		myconf="${myconf} --with-screen=mcslang"
-	elif use ncurses && ! use slang ; then
-		myconf="${myconf} --with-screen=ncurses"
-	else
-		use slang && myconf="${myconf} --with-screen=slang"
-	fi
-
-	myconf="${myconf} `use_with gpm gpm-mouse`"
-
-	use nls \
-	    && myconf="${myconf} --with-included-gettext" \
-	    || myconf="${myconf} --disable-nls"
-
-	myconf="${myconf} `use_with X x`"
-
-	use samba \
-	    && myconf="${myconf} --with-samba --with-configdir=/etc/samba
-				--with-codepagedir=/var/lib/samba/codepages --with-privatedir=/etc/samba/private" \
-	    || myconf="${myconf} --without-samba"
-
-	econf \
-	    --with-vfs \
-	    --with-gnu-ld \
-	    --with-ext2undel \
-	    --with-edit \
-		--enable-charset \
-	    ${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	 cat ${FILESDIR}/chdir-4.6.0.gentoo >>\
-		 ${S}/lib/mc-wrapper.sh
-
-	einstall || die
-
-	# install cons.saver setuid, to actually work
-	chmod u+s ${D}/usr/lib/mc/cons.saver
-
-	dodoc ChangeLog AUTHORS MAINTAINERS FAQ INSTALL* NEWS README*
-
-	insinto /usr/share/mc
-	doins ${FILESDIR}/mc.gentoo
-}
-
-pkg_postinst() {
-	einfo "Add the following line to your ~/.bashrc to"
-	einfo "allow mc to chdir to its latest working dir at exit"
-	einfo ""
-	einfo "# Midnight Commander chdir enhancement"
-	einfo "if [ -f /usr/share/mc/mc.gentoo ]; then"
-	einfo "	. /usr/share/mc/mc.gentoo"
-	einfo "fi"
-}