bug #68037, bug #88247, bug #77265

Package-Manager: portage-2.0.51.22-r1

6 files changed, 198 insertions, 16 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 63ac77f7f7c7..333ba0da4072 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/mc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.80 2005/04/26 11:38:53 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.81 2005/06/10 10:34:04 lanius Exp $
+
+*mc-4.6.0-r14 (06 Jun 2005)
+
+  06 Jun 2005; Heinrich Wendel <lanius@gentoo.org>
+  +files/mc-4.6.0-7zip.patch, +files/mc.ini, +mc-4.6.0-r14.ebuild:
+  bug #68037, bug #88247, bug #77265
 
   26 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
   +files/mc-4.6.0-gcc4.patch, mc-4.6.0-r13.ebuild:
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 8b97b3c81216..ab120fa1e484 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,30 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c93014c00e1400c025eccf0be2cc4cf2 ChangeLog 11964
 MD5 5142111058e160d1a6618166dcd017e0 mc-4.6.0-r13.ebuild 3291
-MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 ab179c2f30cd770eb6e0995f6567e434 mc-4.6.0-r12.ebuild 3145
+MD5 983a7db7cb5d95d17811eda9a7fb144b ChangeLog 12149
+MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
+MD5 de4c7b5d312efd9d7a72c0b07bb37faf mc-4.6.0-r14.ebuild 3872
+MD5 b07d2f1ccf2c5b607caaeaa82ad1681e files/mc-4.6.0-key.c.patch 811
+MD5 169bb0ff53b2a9c5271503bbcbccf3df files/mc-4.6.0-find.patch 5798
+MD5 6356abe34b8907ad2cfedd4cf8ef365e files/mc-4.6.0-ebuild-syntax.patch 296
 MD5 4df4331a2db0f5e9c0f2c0c9bb683fc3 files/mc-4.6.0-vfs.patch 336
-MD5 835695dda387b59a2497658f3f5af1d5 files/mc.gentoo 322
+MD5 d576baf06c64df107664f4724b7632a2 files/digest-mc-4.6.0-r12 139
+MD5 d576baf06c64df107664f4724b7632a2 files/digest-mc-4.6.0-r13 139
+MD5 947a18b172bf06ad72d511b62cfc0ad8 files/digest-mc-4.6.0-r14 203
+MD5 23a5069637af088015fe5f0de8c42883 files/mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
+MD5 cc807a7e72b64d07dd856c6dd9099e3a files/mc-4.6.0-can-2004-1004-1005-1092-1176.patch.bz2 1550
 MD5 76ff126c3a7eb5dba1bf09f30628bf45 files/mc-4.6.0-gcc4.patch 703
+MD5 835695dda387b59a2497658f3f5af1d5 files/mc.gentoo 322
 MD5 9f528fa7b6b4d2c202ce5f4e3a5173ba files/chdir-4.6.0.gentoo 159
+MD5 3f426ce18f8bf82d9e9c3347525d75e8 files/mc-4.6.0-utf8.patch.bz2 30359
+MD5 7fadf4867e255f1d7254181267759775 files/mc.ini 43
+MD5 3bb3f2fa14fdb654e1352bdd406d848f files/mc-4.6.0-largefile.patch 5751
+MD5 d50226ee603389fc0afd3f81d270ec0f files/mc-4.6.0-7zip.patch 739
 MD5 2a6c3ed30597eadaa19a6dbdd3ce168d files/mc-4.6.0-cpan-2003-1023.patch 475
-MD5 23a5069637af088015fe5f0de8c42883 files/mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
-MD5 b07d2f1ccf2c5b607caaeaa82ad1681e files/mc-4.6.0-key.c.patch 811
-MD5 d576baf06c64df107664f4724b7632a2 files/digest-mc-4.6.0-r13 139
-MD5 169bb0ff53b2a9c5271503bbcbccf3df files/mc-4.6.0-find.patch 5798
-MD5 d576baf06c64df107664f4724b7632a2 files/digest-mc-4.6.0-r12 139
 MD5 33aafc4a9c8134eb13d62fed6b81888e files/ebuild.syntax 2588
 MD5 99fd5760d0ddfc08292de6a62b573e73 files/mc-4.6.0-ftp.patch 285
-MD5 6356abe34b8907ad2cfedd4cf8ef365e files/mc-4.6.0-ebuild-syntax.patch 296
-MD5 3bb3f2fa14fdb654e1352bdd406d848f files/mc-4.6.0-largefile.patch 5751
-MD5 3f426ce18f8bf82d9e9c3347525d75e8 files/mc-4.6.0-utf8.patch.bz2 30359
-MD5 cc807a7e72b64d07dd856c6dd9099e3a files/mc-4.6.0-can-2004-1004-1005-1092-1176.patch.bz2 1550
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCbilb1ZcsMnZjRyIRAmK4AJ9CmDi9/TJtStySozEnrH2YSVsoqwCgnz0z
-fUmKqmhNqClMRjm1T6Xu2QA=
-=9NXZ
+iD8DBQFCqWzMevY57Fted3ERAsLfAKCjqgxgaZY5MyP2vMPq33rxDa2d2QCg3cDW
+ezdPXvLz7AxzpF/sFy9zt44=
+=UgDK
 -----END PGP SIGNATURE-----
diff --git a/app-misc/mc/files/digest-mc-4.6.0-r14 b/app-misc/mc/files/digest-mc-4.6.0-r14
new file mode 100644
index 000000000000..0d93e8ca2e29
--- /dev/null
+++ b/app-misc/mc/files/digest-mc-4.6.0-r14
@@ -0,0 +1,3 @@
+MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676
+MD5 c2eb2135bcf8dbed1c2fc4a6e41e4917 mc-4.6.0-sambalib-3.0.10.patch.bz2 401006
+MD5 60a8e4524554a550472622db7fcf728f u7z-4.16beta.tar.bz2 3041
diff --git a/app-misc/mc/files/mc-4.6.0-7zip.patch b/app-misc/mc/files/mc-4.6.0-7zip.patch
new file mode 100644
index 000000000000..7991f48cf7de
--- /dev/null
+++ b/app-misc/mc/files/mc-4.6.0-7zip.patch
@@ -0,0 +1,24 @@
+--- lib/mc.ext.in.old	2003-01-30 17:48:33.000000000 +0200
++++ lib/mc.ext.in	2004-10-25 13:53:49.475582536 +0300
+@@ -167,6 +167,11 @@
+ 	Open=nroff @MAN_FLAGS@ -ms %f | %var{PAGER:more}
+ 	View=%view{ascii,nroff} nroff @MAN_FLAGS@ -ms %f
+ 
++# 7-Zip, Needs to be before manual page definitions
++regex/\.(7z|7Z)$
++	View=%view{ascii} 7z l %f
++	Open=%cd %p#u7z
++
+ # Manual page - compressed
+ regex/([^0-9]|^[^\.]*)\.([1-9][a-z]?|n)\.g?[Zz]$
+ 	Open=gzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@ | %var{PAGER:more}
+--- vfs/extfs/extfs.ini.old	2002-12-09 16:16:33.000000000 +0200
++++ vfs/extfs/extfs.ini	2004-10-25 13:56:04.555047336 +0300
+@@ -7,6 +7,7 @@
+ ulha
+ urar
+ uha
++u7z
+ # For arj usage you need a special patch to unarj (see unarj.diff)
+ uarj
+ 
diff --git a/app-misc/mc/files/mc.ini b/app-misc/mc/files/mc.ini
new file mode 100644
index 000000000000..890658ecd2a5
--- /dev/null
+++ b/app-misc/mc/files/mc.ini
@@ -0,0 +1,2 @@
+[Midnight-Commander]
+use_8th_bit_as_meta=0
diff --git a/app-misc/mc/mc-4.6.0-r14.ebuild b/app-misc/mc/mc-4.6.0-r14.ebuild
new file mode 100644
index 000000000000..8b75affa62bc
--- /dev/null
+++ b/app-misc/mc/mc-4.6.0-r14.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r14.ebuild,v 1.1 2005/06/10 10:34:04 lanius Exp $
+
+inherit flag-o-matic eutils
+
+U7Z_PV="4.16"
+U7Z="u7z-${U7Z_PV}beta.tar.bz2"
+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
+	mirrors://gentoo/${P}-sambalib-3.0.10.patch.bz2
+	7zip? ( http://sgh.nightmail.ru/files/u7z/${U7Z} )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+IUSE="gpm nls samba ncurses X slang unicode 7zip"
+
+PROVIDE="virtual/editor"
+
+RDEPEND=">=sys-fs/e2fsprogs-1.19
+	ncurses? ( >=sys-libs/ncurses-5.2-r5 )
+	=dev-libs/glib-2*
+	pam? ( >=sys-libs/pam-0.72 )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	slang? ( >=sys-libs/slang-1.4.9-r1 )
+	samba? ( >=net-fs/samba-3.0.0 )
+	unicode? ( >=sys-libs/slang-1.4.9-r1 )
+	X? ( virtual/x11 )
+	x86? ( 7zip? ( >=app-arch/p7zip-4.16 ) )
+	ppc? ( 7zip? ( >=app-arch/p7zip-4.16 ) )
+	amd64? ( 7zip? ( >=app-arch/p7zip-4.16 ) )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	if ( use x86 || use amd64 || use ppc ) && use 7zip; then
+		unpack ${U7Z}
+	fi
+	unpack ${P}.tar.gz
+	cd ${S}
+
+	epatch ${DISTDIR}/${P}-sambalib-3.0.10.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}-can-2004-1004-1005-1092-1176.patch.bz2
+	epatch ${FILESDIR}/${P}-vfs.patch
+	if ( use x86 || use amd64 || use ppc ) && use 7zip; then
+		epatch ${FILESDIR}/${P}-7zip.patch
+	fi
+	epatch ${FILESDIR}/${P}-ftp.patch
+	epatch ${FILESDIR}/${P}-largefile.patch
+	epatch ${FILESDIR}/${P}-key.c.patch
+	# Fix building with gcc4.
+	epatch ${FILESDIR}/${P}-gcc4.patch
+
+	if use unicode && use slang; then
+		epatch ${FILESDIR}/${P}-utf8.patch.bz2
+	fi
+}
+
+src_compile() {
+	append-flags -I/usr/include/gssapi
+	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
+	doins ${FILESDIR}/mc.ini
+
+	if ( use x86 || use amd64 || use ppc ) && use 7zip; then
+		cd ../${U7Z_PV}
+		exeinto /usr/share/mc/extfs
+		doexe u7z
+		dodoc readme.u7z
+		newdoc ChangeLog ChangeLog.u7z
+	fi
+
+	insinto /usr/share/mc/syntax
+	doins ${FILESDIR}/ebuild.syntax
+	cd ${D}/usr/share/mc/syntax
+	epatch ${FILESDIR}/${P}-ebuild-syntax.patch
+
+	# http://bugs.gentoo.org/show_bug.cgi?id=71275
+	rm -f ${D}/usr/share/locale/locale.alias
+}
+
+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"
+}