add support for cons.saver, bug #51506, remove samba 2.x support

4 files changed, 113 insertions, 8 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index efe3e4c5dc5e..3485514a1648 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-misc/mc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
 
+  24 May 2004; Heinrich Wendel <lanius@gentoo.org> :
+  add support for cons.saver, bug #51506, remove samba 2.x support
+
   14 May 2004; Joshua Kinard <kumba@gentoo.org> mc-4.6.0-r7.ebuild:
   Marked stable on mips.
 
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index b76c4964d329..0a787a874fba 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,14 +1,16 @@
-MD5 9645be385a14930e9271188c44e124a1 ChangeLog 7337
 MD5 9d5874fc54546772bb7d727a5d1bc672 mc-4.5.55-r7.ebuild 2003
+MD5 aacbbb4f307c0cd82abda10bb6508d48 mc-4.6.0-r7.ebuild 2675
+MD5 92187b0e55c96ad98d03649a8383a177 mc-4.6.0-r8.ebuild 2577
+MD5 9645be385a14930e9271188c44e124a1 ChangeLog 7337
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 534a6a2939ea3ce2b3afbf8c1616d7d8 mc-4.6.0-r5.ebuild 2580
-MD5 aacbbb4f307c0cd82abda10bb6508d48 mc-4.6.0-r7.ebuild 2675
-MD5 9f528fa7b6b4d2c202ce5f4e3a5173ba files/chdir-4.6.0.gentoo 159
 MD5 d8853d9a555c715676945a15c98030c1 files/digest-mc-4.5.55-r7 125
-MD5 4df4331a2db0f5e9c0f2c0c9bb683fc3 files/mc-4.6.0-vfs.patch 336
-MD5 042fefdf0b2c229a62b4e18200099389 files/digest-mc-4.6.0-r7 214
-MD5 042fefdf0b2c229a62b4e18200099389 files/digest-mc-4.6.0-r5 214
-MD5 2a6c3ed30597eadaa19a6dbdd3ce168d files/mc-4.6.0-cpan-2003-1023.patch 475
 MD5 169bb0ff53b2a9c5271503bbcbccf3df files/mc-4.6.0-find.patch 5798
-MD5 835695dda387b59a2497658f3f5af1d5 files/mc.gentoo 322
+MD5 4df4331a2db0f5e9c0f2c0c9bb683fc3 files/mc-4.6.0-vfs.patch 336
 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 2a6c3ed30597eadaa19a6dbdd3ce168d files/mc-4.6.0-cpan-2003-1023.patch 475
+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-r8 139
diff --git a/app-misc/mc/files/digest-mc-4.6.0-r8 b/app-misc/mc/files/digest-mc-4.6.0-r8
new file mode 100644
index 000000000000..c66b6aee0770
--- /dev/null
+++ b/app-misc/mc/files/digest-mc-4.6.0-r8
@@ -0,0 +1,2 @@
+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/mc-4.6.0-r8.ebuild b/app-misc/mc/mc-4.6.0-r8.ebuild
new file mode 100644
index 000000000000..d8be13f74d54
--- /dev/null
+++ b/app-misc/mc/mc-4.6.0-r8.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r8.ebuild,v 1.1 2004/05/24 16:49:49 lanius 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"
+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
+}
+
+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"
+}