bug #27212

7 files changed, 13 insertions, 167 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 009d68ac909f..8e80c1154728 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/mc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
 
+  02 Sep 2003; Heinrich Wendel <lanius@gentoo.org> mc-4.6.0-r1.ebuild,
+  mc-4.6.0-r2.ebuild, mc-4.6.0.ebuild:
+  fixed bug #27212, marked -r2 stable
+
 *mc-4.6.0-r2 (21 Aug 2003)
 
   21 Aug 2003; Heinrich Wendel <lanius@gentoo.org> mc-4.6.0-r2.ebuild,
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 27fd61c89356..f6dc251a7ff6 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,11 +1,7 @@
+MD5 d2d5359c2165abc5518cc77b2c3982c7 ChangeLog 4766
+MD5 4090f3780e5d0172d9571a02881e8b40 mc-4.5.55-r7.ebuild 2039
+MD5 94f1f6e0f12f2de4d942935338839bd1 mc-4.6.0-r2.ebuild 2397
 MD5 9f528fa7b6b4d2c202ce5f4e3a5173ba files/chdir-4.6.0.gentoo 159
 MD5 d8853d9a555c715676945a15c98030c1 files/digest-mc-4.5.55-r7 125
-MD5 c5a71ea818f2b8043cd26204c5d281d7 files/digest-mc-4.6.0 120
-MD5 8a984e82187b67b6f31c45005ea0ba3d files/digest-mc-4.6.0-r1 61
 MD5 835695dda387b59a2497658f3f5af1d5 files/mc.gentoo 322
 MD5 8a984e82187b67b6f31c45005ea0ba3d files/digest-mc-4.6.0-r2 61
-MD5 6ce60c68bd3f2f7e87d2c07e471880f2 mc-4.5.55-r7.ebuild 2038
-MD5 fc9722d2aa05a13285a95bf83f18e595 mc-4.6.0.ebuild 1839
-MD5 6e728fcb48031502109cfc362b3a9a70 mc-4.6.0-r1.ebuild 2272
-MD5 1b552b6a3eea589c5717cb1c441246ee mc-4.6.0-r2.ebuild 2297
-MD5 574aa9a638d5369c5f864f5ed629a369 ChangeLog 4617
diff --git a/app-misc/mc/files/digest-mc-4.6.0 b/app-misc/mc/files/digest-mc-4.6.0
deleted file mode 100644
index 7169c115adee..000000000000
--- a/app-misc/mc/files/digest-mc-4.6.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fb151d5796ceb26b7e92fc1af4827158 /mc-4.6.0.ebuild 1840
-MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676
diff --git a/app-misc/mc/files/digest-mc-4.6.0-r1 b/app-misc/mc/files/digest-mc-4.6.0-r1
deleted file mode 100644
index 1ea08f5eaef9..000000000000
--- a/app-misc/mc/files/digest-mc-4.6.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676
diff --git a/app-misc/mc/mc-4.6.0-r1.ebuild b/app-misc/mc/mc-4.6.0-r1.ebuild
deleted file mode 100644
index 1633da88c628..000000000000
--- a/app-misc/mc/mc-4.6.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2003 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-r1.ebuild,v 1.6 2003/08/08 09:40:17 taviso Exp $
-
-IUSE="gpm nls samba ncurses X slang"
-
-S=${WORKDIR}/${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}/${P}.tar.gz"
-
-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 ~ppc ~sparc alpha mips hppa ~arm"
-	
-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-x" \
-	    || myconf="${myconf} --without-x"
-	
-	use samba \
-	    && myconf="${myconf} --with-samba --with-configdir=/etc/samba
-				--with-codepagedir=/var/lib/samba/codepages" \
-	    || myconf="${myconf} --without-samba"
- 
-	econf \
-	    --with-vfs \
-	    --with-gnu-ld \
-	    --with-ext2undel \
-	    --with-edit \
-	    ${myconf} || die
-	emake || die
-}
-
-src_install() {                               
-	 cat ${FILESDIR}/chdir-4.6.0.gentoo >>\
-	 ${S}/lib/mc-wrapper.sh
-	
-	einstall || die
-	
-	dodoc ABOUT-NLS COPYING* 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 it's 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-r2.ebuild b/app-misc/mc/mc-4.6.0-r2.ebuild
index 0d00ef070442..d0ca439ad39d 100644
--- a/app-misc/mc/mc-4.6.0-r2.ebuild
+++ b/app-misc/mc/mc-4.6.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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-r2.ebuild,v 1.1 2003/08/21 11:20:31 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r2.ebuild,v 1.2 2003/09/02 16:06:39 lanius Exp $
 
 IUSE="gpm nls samba ncurses X slang"
 
@@ -20,7 +20,7 @@ DEPEND=">=sys-apps/e2fsprogs-1.19
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+KEYWORDS="x86 ppc sparc alpha mips hppa arm"
 	
 src_compile() {                           
 	local myconf=""
@@ -60,6 +60,10 @@ src_compile() {
 	    --with-edit \
 		--enable-charset \
 	    ${myconf} || die
+
+	# bug 27212
+	sed -i '/#define HAVE_SYS_CAPABILITY_H 1/a#define _LINUX_VFS_H' vfs/samba/include/config.h
+
 	emake || die
 }
 
diff --git a/app-misc/mc/mc-4.6.0.ebuild b/app-misc/mc/mc-4.6.0.ebuild
deleted file mode 100644
index 558d91509b9c..000000000000
--- a/app-misc/mc/mc-4.6.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2003 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.ebuild,v 1.7 2003/06/17 20:59:39 gmsoft Exp $
-
-IUSE="gpm nls samba ncurses X slang"
-
-S=${WORKDIR}/${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}/${P}.tar.gz"
-
-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 ~ppc sparc ~alpha mips hppa ~arm"
-	
-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-x" \
-	    || myconf="${myconf} --without-x"
-	
-	use samba \
-	    && myconf="${myconf} --with-samba --with-configdir=/etc/samba
-				--with-codepagedir=/var/lib/samba/codepages" \
-	    || myconf="${myconf} --without-samba"
- 
-	econf \
-	    --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*
-}
-