Couple small fixes for MC and cleaned up the ebuilds.

5 files changed, 15 insertions, 90 deletions

diff --git a/gnome-extra/mc/ChangeLog b/gnome-extra/mc/ChangeLog
index e5c705b31c96..582e6fd4be17 100644
--- a/gnome-extra/mc/ChangeLog
+++ b/gnome-extra/mc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/mc
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mc/ChangeLog,v 1.7 2002/07/08 21:03:44 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mc/ChangeLog,v 1.8 2002/08/23 17:50:37 naz Exp $
+
+*mc-4.5.55-r6 (27 Aug 2002)
+  
+  27 Aug 2002; Michael Nazaroff <naz@gentoo.org> mc-4.5.55-r6.ebuild :
+
+  More samba fixes and added a ncurses use flag to ebuild.  Thanx to Tom Prado
+  <tprado@charter.net> for the patch he sent, very nice work.  Also removing r5
+  and r4 version of the ebuild.
 
 *mc-4.5.55-r5 (20 Jun 2002)
 
diff --git a/gnome-extra/mc/files/digest-mc-4.5.55-r5 b/gnome-extra/mc/files/digest-mc-4.5.55-r5
deleted file mode 100644
index 60b693823ea7..000000000000
--- a/gnome-extra/mc/files/digest-mc-4.5.55-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bb670d48589f26f00b7fce8d25f66bd6 mc-4.5.55.tar.gz 4849958
diff --git a/gnome-extra/mc/files/digest-mc-4.5.55-r4 b/gnome-extra/mc/files/digest-mc-4.5.55-r6
index 60b693823ea7..60b693823ea7 100644
--- a/gnome-extra/mc/files/digest-mc-4.5.55-r4
+++ b/gnome-extra/mc/files/digest-mc-4.5.55-r6
diff --git a/gnome-extra/mc/mc-4.5.55-r4.ebuild b/gnome-extra/mc/mc-4.5.55-r4.ebuild
deleted file mode 100644
index 386d1b89749f..000000000000
--- a/gnome-extra/mc/mc-4.5.55-r4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mc/mc-4.5.55-r4.ebuild,v 1.6 2002/08/16 04:14:00 murphy Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNOME Midnight Commander"
-SRC_URI="http://www.gnome.org/projects/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/projects/mc/"
-
-DEPEND="virtual/glibc
-	>=sys-apps/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 )
-	slang? ( >=sys-libs/slang-1.4.2 )
-	nls? ( sys-devel/gettext )
-	samba? ( >=net-fs/samba-2.2.3a-r1 )
-	X? ( virtual/x11 )"
-#currently broken
-#	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc sparc64"
-
-src_compile() {                           
-	local myconf=""
-
-	use pam && myconf="${myconf} --with-pam"
-	use pam || myconf="${myconf} --without-pam"
-
-	use slang && myconf="${myconf} --with-slang"
-	use slang || myconf="${myconf} --with-included-slang"
-
-#currently broken
-#	use gnome && myconf="${myconf} --with-gnome"
-#	use gnome || myconf="${myconf} --without-gnome"
-	myconf="${myconf} --without-gnome"
-
-	use gpm && myconf="${myconf} --with-gpm-mouse=/usr"
-	use gpm || myconf="${myconf} --without-gpm-mouse"
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	use X && myconf="${myconf} --with-tm-x-support"
-	use X || myconf="${myconf} --without-tm-x-support"
-
-	if [ "`use samba`" ] ; then
-		cd ${S}/vfs
-		cp smbfs.c smbfs.c.orig
-		sed -e "s:/etc/smb\.conf:/etc/smb/smb\.conf:" smbfs.c.orig > smbfs.c
-		myconf="${myconf} --with-samba"
-	fi
-
-	cd ${S}
-#	export WANT_AUTOMAKE_1_5=1
-	libtoolize --force --copy
-	aclocal -I ${S}/macros
-#	autoconf
-	automake --add-missing
-
-	LDFLAGS="-lcrypt -lncurses" ./configure --host=${CHOST} 	 \
-						--prefix=/usr		 \
-						--mandir=/usr/share/man	 \
-						--sysconfdir=/etc	 \
-						--localstatedir=/var/lib \
-						--with-vfs 		 \
-						--with-netrc 		 \
-						--with-ext2undel	\
-						$myconf || die
-
-	make || die  # Doesn't work with -j 4 (hallski)
-}
-
-src_install() {                               
-	make prefix=${D}/usr						 \
-	     mandir=${D}/usr/share/man					 \
-	     sysconfdir=${D}/etc					 \
-	     localstatedir=${D}/var/lib					\
-	     install || die
-
-	dodoc ABOUT-NLS COPYING* FAQ INSTALL* NEWS README*
-}
-
diff --git a/gnome-extra/mc/mc-4.5.55-r5.ebuild b/gnome-extra/mc/mc-4.5.55-r6.ebuild
index 0d4cd7ab13da..71c8aceaf158 100644
--- a/gnome-extra/mc/mc-4.5.55-r5.ebuild
+++ b/gnome-extra/mc/mc-4.5.55-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mc/mc-4.5.55-r5.ebuild,v 1.3 2002/08/16 04:14:00 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mc/mc-4.5.55-r6.ebuild,v 1.1 2002/08/23 17:50:37 naz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNOME Midnight Commander"
@@ -13,6 +13,7 @@ DEPEND="virtual/glibc
 	>=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 )
@@ -30,8 +31,10 @@ src_compile() {
 	use pam && myconf="${myconf} --with-pam"
 	use pam || myconf="${myconf} --without-pam"
 
+	use ncurses && myconf="${myconf} --with-ncurses" || ( \
 	use slang && myconf="${myconf} --with-slang"
 	use slang || myconf="${myconf} --with-included-slang"
+	)
 
 #currently broken
 #	use gnome && myconf="${myconf} --with-gnome"
@@ -46,6 +49,7 @@ src_compile() {
 	use X && myconf="${myconf} --with-tm-x-support"
 	use X || myconf="${myconf} --without-tm-x-support"
 
+	use samba && myconf="${myconf} --with-samba"
 	use samba && ( \
 		cd ${S}/vfs
 		cp smbfs.c smbfs.c.orig
@@ -54,7 +58,6 @@ src_compile() {
 		cp Makefile.in Makefile.in.orig
 		sed -e 's:$(LIBDIR)\(/codepages\):/var/lib/samba\1:' \
 			Makefile.in.orig > Makefile.in
-		myconf="${myconf} --with-samba"
 	)
 
 	cd ${S}
@@ -64,7 +67,7 @@ src_compile() {
 #	autoconf
 	automake --add-missing
 
-	LDFLAGS="-lcrypt -lncurses" ./configure --host=${CHOST} 	 \
+	./configure --host=${CHOST} 	 \
 						--prefix=/usr		 \
 						--mandir=/usr/share/man	 \
 						--sysconfdir=/etc	 \