add patch to support .tbz and .tbz2 archives

10 files changed, 63 insertions, 241 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 63315d2391c8..bebbe6798598 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/mc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
 
+*mc-4.6.0-r6 (13 Apr 2004)
+
+  13 Apr 2004; Heinrich Wendel <lanius@gentoo.org> mc-4.6.0-r2.ebuild,
+  mc-4.6.0-r3.ebuild, mc-4.6.0-r4.ebuild, mc-4.6.0-r6.ebuild, metadata.xml,
+  files/mc-4.6.0-vfs.patch:
+  add patch to support .tbz and .tbz2 archives
+
 *mc-4.6.0-r5 (29 Mar 2004)
 
   29 Mar 2004; Heinrich Wendel <lanius@gentoo.org> mc-4.6.0-r5.ebuild,
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 0646270d824f..ddf6e45b1fdf 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,15 +1,13 @@
-MD5 9f528fa7b6b4d2c202ce5f4e3a5173ba files/chdir-4.6.0.gentoo 159
+MD5 9d5874fc54546772bb7d727a5d1bc672 mc-4.5.55-r7.ebuild 2003
+MD5 9f1541f17cc9a97b072fdd37d69f6776 mc-4.6.0-r6.ebuild 2613
+MD5 67439d7e3237a61f2b1c010edea4fec0 ChangeLog 6448
+MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
+MD5 fbf2e114f4ca5132abb5923a356e6d25 mc-4.6.0-r5.ebuild 2570
 MD5 d8853d9a555c715676945a15c98030c1 files/digest-mc-4.5.55-r7 125
-MD5 8a984e82187b67b6f31c45005ea0ba3d files/digest-mc-4.6.0-r2 61
-MD5 2d424423db44876676d99d74bbf9d6d9 files/digest-mc-4.6.0-r3 202
-MD5 ad3b40a33b55bd202bef8e0d685bdfe1 files/digest-mc-4.6.0-r4 139
 MD5 169bb0ff53b2a9c5271503bbcbccf3df files/mc-4.6.0-find.patch 5798
+MD5 4df4331a2db0f5e9c0f2c0c9bb683fc3 files/mc-4.6.0-vfs.patch 336
 MD5 835695dda387b59a2497658f3f5af1d5 files/mc.gentoo 322
-MD5 cb6671a351f7b813ae6c70fa65c5892b files/digest-mc-4.6.0-r5 211
+MD5 9f528fa7b6b4d2c202ce5f4e3a5173ba files/chdir-4.6.0.gentoo 159
 MD5 2a6c3ed30597eadaa19a6dbdd3ce168d files/mc-4.6.0-cpan-2003-1023.patch 475
-MD5 1f8fc1952e273166204e4459ee6a76cb ChangeLog 6197
-MD5 9d5874fc54546772bb7d727a5d1bc672 mc-4.5.55-r7.ebuild 2003
-MD5 a341eb71553cd679309d5a096fedd138 mc-4.6.0-r2.ebuild 2338
-MD5 2a76834dcbb80d7dfb0c8ca9fb3c6782 mc-4.6.0-r3.ebuild 2770
-MD5 40a014c0213286086596798a2015389b mc-4.6.0-r4.ebuild 2626
-MD5 fbf2e114f4ca5132abb5923a356e6d25 mc-4.6.0-r5.ebuild 2570
+MD5 cb6671a351f7b813ae6c70fa65c5892b files/digest-mc-4.6.0-r5 211
+MD5 cb6671a351f7b813ae6c70fa65c5892b files/digest-mc-4.6.0-r6 211
diff --git a/app-misc/mc/files/digest-mc-4.6.0-r2 b/app-misc/mc/files/digest-mc-4.6.0-r2
deleted file mode 100644
index 1ea08f5eaef9..000000000000
--- a/app-misc/mc/files/digest-mc-4.6.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676
diff --git a/app-misc/mc/files/digest-mc-4.6.0-r3 b/app-misc/mc/files/digest-mc-4.6.0-r3
deleted file mode 100644
index a19309a7e5ad..000000000000
--- a/app-misc/mc/files/digest-mc-4.6.0-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676
-MD5 3378ef7b8f4029f7aa4ee6944694cf1f mc-4.6.0-sambalib.patch.bz2 337051
-MD5 af0305d7fe9be23c561de020942a2ec1 mc-4.6.0-samba.patch.bz2 605076
diff --git a/app-misc/mc/files/digest-mc-4.6.0-r4 b/app-misc/mc/files/digest-mc-4.6.0-r6
index 24b1faf9e9da..521c590e6ab2 100644
--- a/app-misc/mc/files/digest-mc-4.6.0-r4
+++ b/app-misc/mc/files/digest-mc-4.6.0-r6
@@ -1,2 +1,3 @@
 MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676
 MD5 dda658d40601e29e3478ba48c3d9490e mc-4.6.0-sambalib-3.0.0.patch.bz2 399778
+MD5 3378ef7b8f4029f7aa4ee6944694cf1f mc-4.6.0-sambalib.patch.bz2 337051
diff --git a/app-misc/mc/files/mc-4.6.0-vfs.patch b/app-misc/mc/files/mc-4.6.0-vfs.patch
new file mode 100644
index 000000000000..6b1212a3bba8
--- /dev/null
+++ b/app-misc/mc/files/mc-4.6.0-vfs.patch
@@ -0,0 +1,11 @@
+--- lib/mc.ext.in.1	2004-04-13 13:59:03.977958307 +0200
++++ lib/mc.ext.in	2004-04-13 13:59:47.962917739 +0200
+@@ -388,7 +388,7 @@
+ 	# Open=%cd %p#utar
+ 	View=%view{ascii} bzip -dc %f 2>/dev/null | tar tvvf -
+ 
+-regex/\.tar\.bz2$
++regex/\.t(ar\.bz2|bz|bz2)$
+ 	Open=%cd %p#utar
+ 	View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf -
+ 
diff --git a/app-misc/mc/mc-4.6.0-r2.ebuild b/app-misc/mc/mc-4.6.0-r2.ebuild
deleted file mode 100644
index 14105c717adc..000000000000
--- a/app-misc/mc/mc-4.6.0-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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-r2.ebuild,v 1.8 2004/03/14 10:52:01 mr_bones_ Exp $
-
-inherit flag-o-matic
-
-IUSE="gpm nls samba ncurses X slang"
-
-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-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-2.2.3a-r1 )
-	X? ( virtual/x11 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha mips hppa"
-
-filter-flags -malign-double
-
-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 \
-		--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
-}
-
-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 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-r3.ebuild b/app-misc/mc/mc-4.6.0-r3.ebuild
deleted file mode 100644
index ec255b362515..000000000000
--- a/app-misc/mc/mc-4.6.0-r3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# 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-r3.ebuild,v 1.14 2004/04/06 04:20:51 vapier Exp $
-
-inherit flag-o-matic eutils
-
-IUSE="gpm nls samba ncurses X slang"
-
-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.patch.bz2
-	http://www.spock.mga.com.pl/public/gentoo/${P}-samba.patch.bz2"
-
-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-2.2.3a-r1 )
-	X? ( virtual/x11 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="ia64 x86 ppc sparc alpha mips hppa amd64"
-
-filter-flags -malign-double
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	has_version '>=net-fs/samba-3.0.0' &&
-		epatch ${DISTDIR}/mc-4.6.0-samba.patch.bz2
-	has_version '<net-fs/samba-3.0.0' &&
-		epatch ${DISTDIR}/mc-4.6.0-sambalib.patch.bz2
-	epatch ${FILESDIR}/mc-4.6.0-find.patch
-}
-
-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 --with-privatedir=/etc/samba/private" \
-	    || myconf="${myconf} --without-samba"
-
-	econf \
-	    --with-vfs \
-	    --with-gnu-ld \
-	    --with-ext2undel \
-	    --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
-}
-
-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 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-r4.ebuild b/app-misc/mc/mc-4.6.0-r6.ebuild
index 99be68941d93..7f3c9c8b12b3 100644
--- a/app-misc/mc/mc-4.6.0-r4.ebuild
+++ b/app-misc/mc/mc-4.6.0-r6.ebuild
@@ -1,15 +1,19 @@
 # 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-r4.ebuild,v 1.8 2004/04/06 04:20:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r6.ebuild,v 1.1 2004/04/13 12:06:16 lanius Exp $
 
 inherit flag-o-matic eutils
 
-IUSE="gpm nls samba ncurses X slang"
-
 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"
+	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib-3.0.0.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 )
@@ -17,47 +21,43 @@ DEPEND=">=sys-fs/e2fsprogs-1.19
 	>=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 )
+	samba? ( net-fs/samba )
 	X? ( virtual/x11 )"
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="ia64 ~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64"
-
-filter-flags -malign-double
-
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
-	epatch ${DISTDIR}/${P}-sambalib-3.0.0.patch.bz2
+
+	has_version '>=net-fs/samba-3.0.0' &&
+		epatch ${DISTDIR}/${P}-sambalib-3.0.0.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}-vfs.patch
 }
 
 src_compile() {
+	filter-flags -malign-double
+
 	local myconf=""
 
-	if ! use slang && ! use ncurses
-	    then
+	if ! use slang && ! use ncurses ; then
 		myconf="${myconf} --with-screen=mcslang"
-	    elif
-		use ncurses && ! use slang
-	    then
+	elif use ncurses && ! use slang ; then
 		myconf="${myconf} --with-screen=ncurses"
-	    else
+	else
 		use slang && myconf="${myconf} --with-screen=slang"
 	fi
 
-	use gpm \
-	    && myconf="${myconf} --with-gpm-mouse" \
-	    || myconf="${myconf} --without-gpm-mouse"
+	myconf="${myconf} `use_with gpm gpm-mouse`"
 
 	use nls \
 	    && myconf="${myconf} --with-included-gettext" \
 	    || myconf="${myconf} --disable-nls"
 
-	use X \
-	    && myconf="${myconf} --with-x" \
-	    || myconf="${myconf} --without-x"
+	myconf="${myconf} `use_with X x`"
 
 	use samba \
 	    && myconf="${myconf} --with-samba --with-configdir=/etc/samba
@@ -72,19 +72,16 @@ src_compile() {
 		--enable-charset \
 	    ${myconf} || die
 
-	# bug 27212 (not needed with samba3?)
-	# sed -i '/#define HAVE_SYS_CAPABILITY_H 1/a#define _LINUX_VFS_H' vfs/samba/include/config.h
-
 	emake || die
 }
 
 src_install() {
 	 cat ${FILESDIR}/chdir-4.6.0.gentoo >>\
-	 ${S}/lib/mc-wrapper.sh
+		 ${S}/lib/mc-wrapper.sh
 
 	einstall || die
 
-	dodoc ABOUT-NLS COPYING* ChangeLog AUTHORS MAINTAINERS FAQ INSTALL* NEWS README*
+	dodoc ChangeLog AUTHORS MAINTAINERS FAQ INSTALL* NEWS README*
 
 	insinto /usr/share/mc
 	doins ${FILESDIR}/mc.gentoo
diff --git a/app-misc/mc/metadata.xml b/app-misc/mc/metadata.xml
new file mode 100644
index 000000000000..c3504b40c506
--- /dev/null
+++ b/app-misc/mc/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>lanius@gentoo.org</email>
+  <name>Heinrich Wendel</name>
+</maintainer>
+</pkgmetadata>