lots more code cleanup, and hopefully finally fixed /var/tmp problem

4 files changed, 120 insertions, 12 deletions

diff --git a/gnome-extra/mc/ChangeLog b/gnome-extra/mc/ChangeLog
index ad05e782202b..db024ea01229 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.12 2002/10/30 01:40:59 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mc/ChangeLog,v 1.13 2002/11/10 08:33:09 bcowan Exp $
+
+*mc-4.6.0_pre1-r3 (10 Nov 2002)
+
+  10 Nov 2002; Brad Cowan <bcowan@gentoo.org> mc-4.6.0_pre1-r3.ebuild,    
+  files/digest-mc-4.6.0_pre1-r3 :
+
+  Removed troublesome man2help translations, hopefully finally fixed
+  problem with /var/tmp filling up.
 
 *mc-4.6.0_pre1-r2 (29 Oct 2002)
 
diff --git a/gnome-extra/mc/files/digest-mc-4.6.0_pre1-r3 b/gnome-extra/mc/files/digest-mc-4.6.0_pre1-r3
new file mode 100644
index 000000000000..976f3d4c46db
--- /dev/null
+++ b/gnome-extra/mc/files/digest-mc-4.6.0_pre1-r3
@@ -0,0 +1,2 @@
+MD5 76e9a94f99af475fed6eed4b4a1ea6e4 mc-4.6.0-pre1.tar.gz 3976955
+MD5 a68aca6b8ceb21aaf697047b6036e8c7 mc-4.6.0-pre1-2002-11-07-15.diff.bz2 817096
diff --git a/gnome-extra/mc/mc-4.6.0_pre1-r2.ebuild b/gnome-extra/mc/mc-4.6.0_pre1-r2.ebuild
index 75071eb7e58c..fd4ca9a01bab 100644
--- a/gnome-extra/mc/mc-4.6.0_pre1-r2.ebuild
+++ b/gnome-extra/mc/mc-4.6.0_pre1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mc/mc-4.6.0_pre1-r2.ebuild,v 1.3 2002/11/05 07:05:11 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mc/mc-4.6.0_pre1-r2.ebuild,v 1.4 2002/11/10 08:33:09 bcowan Exp $
 
 IUSE="gpm nls samba ncurses X slang"
 
@@ -11,7 +11,7 @@ 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}/${MY_P}.tar.gz
-	http://www.gentoo.org/~bcowan/${MY_P}-2002-11-04-13.diff.bz2"
+	http://www.gentoo.org/~bcowan/${MY_P}-2002-11-07-15.diff.bz2"
 
 
 DEPEND=">=sys-apps/e2fsprogs-1.19
@@ -63,21 +63,15 @@ src_compile() {
 	    && myconf="${myconf} --with-samba --with-configdir=/etc/samba
 				--with-codepagedir=/var/lib/samba/codepages" \
 	    || myconf="${myconf} --without-samba"
-
-	export LDFLAGS="-lcrypt -lncurses -lpam" 
-	econf --host=${CHOST} \
-	    --prefix=/usr \
-	    --mandir=/usr/share/man \
-	    --sysconfdir=/etc \
-	    --localstatedir=/var/lib \
+ 
+	econf \
 	    --with-glib2 \
 	    --with-vfs \
 	    --with-gnu-ld \
 	    --with-ext2undel \
 	    --with-edit \
 	    ${myconf} || die
-
-	emake || die  
+	emake || die
 }
 
 src_install() {                               
diff --git a/gnome-extra/mc/mc-4.6.0_pre1-r3.ebuild b/gnome-extra/mc/mc-4.6.0_pre1-r3.ebuild
new file mode 100644
index 000000000000..2b4b4343d872
--- /dev/null
+++ b/gnome-extra/mc/mc-4.6.0_pre1-r3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mc/mc-4.6.0_pre1-r3.ebuild,v 1.1 2002/11/10 08:33:09 bcowan Exp $
+
+IUSE="gpm nls samba ncurses X slang"
+
+MY_P=${P/_/-}
+S=${WORKDIR}/${MY_P}
+
+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}/${MY_P}.tar.gz
+	http://cvs.gentoo.org/~bcowan/${MY_P}-2002-11-07-15.diff.bz2"
+
+DEPEND=">=sys-apps/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-2.2.3a-r1 )
+	X? ( virtual/x11 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	patch -E -p1 < ${WORKDIR}/${MY_P}-2002-11-07-15.diff || die
+	
+#Removing help file translations to hopefully fix
+#problem of man2help filling up /var/tmp dir on 
+#certain configurations that are not yet known
+#Note: slang support is the prefered option for mc
+#although ncurses seems to work its not as robust
+#recommended USE flags for english support would be
+#USE="-nls X gpm slang samba -ncurses" emerge mc	
+	
+	cd ${S}/doc
+	mv Makefile.in Makefile.og
+	sed -e '183d' Makefile.og > Makefile.in
+	mv Makefile.am Makefile.orig
+	sed -e '1d;14d' Makefile.orig > Makefile.am
+	
+	cd ${S}
+	mv Makefile.in Makefile.orig
+	sed -e 's|$(distdir)/doc/..||g' Makefile.orig > Makefile.in
+	mv configure.in configure.orig
+	sed -e 's|doc/../mc.1||g;s|doc/../Makefile||g' configure.orig > configure.in
+	mv configure configure.orig
+	sed -e 's|doc/../mc.1||g;s|doc/../Makefile||g' configure.orig > configure			
+	chmod +rx configure
+}	
+
+src_compile() {                           
+	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
+
+	use gpm \
+	    && myconf="${myconf} --with-gpm-mouse" \
+	    || myconf="${myconf} --without-gpm-mouse"
+	    
+	use nls \
+	    && myconf="${myconf} --with-included-gettext" \
+	    || myconf="${myconf} --disable-nls"
+	
+	use X \
+	    && myconf="${myconf} --with-tm-x-support --with-x" \
+	    || myconf="${myconf} --without-tm-x-support --without-x"
+	
+	use samba \
+	    && myconf="${myconf} --with-samba --with-configdir=/etc/samba
+				--with-codepagedir=/var/lib/samba/codepages" \
+	    || myconf="${myconf} --without-samba"
+	
+	econf \
+	    --with-glib2 \
+	    --with-vfs \
+	    --with-gnu-ld \
+	    --with-ext2undel \
+	    --with-edit \
+	    ${myconf} || die
+	emake || die
+}
+
+src_install() {                               
+	einstall
+	
+	dodoc ABOUT-NLS COPYING* ChangeLog AUTHORS MAINTAINERS FAQ INSTALL* NEWS README*
+}
+