Adding bash 3.2 compatibility patch from bug #153925 thanks to mehmetkemal@gmx.net

Package-Manager: portage-2.1.2_rc1-r5

5 files changed, 222 insertions, 5 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 0cbfd98c7393..23827a8fc3b5 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/mc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.110 2006/10/06 15:58:59 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.111 2006/11/15 11:00:22 jokey Exp $
+
+*mc-4.6.1-r3 (15 Nov 2006)
+
+  15 Nov 2006; Markus Ullmann <jokey@gentoo.org>
+  +files/mc-4.6.1-bash-all.patch, +mc-4.6.1-r3.ebuild:
+  Adding bash 3.2 compatibility patch from bug #153925 thanks to
+  mehmetkemal@gmx.net
 
   06 Oct 2006; Emanuele Giaquinta <exg@gentoo.org> -mc-4.6.1-r1.ebuild,
   mc-4.6.1-r2.ebuild:
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index e5bb7ac89d96..a3917d0fc549 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX chdir-4.6.0.gentoo 159 RMD160 5edd511a40033bc11ed6e486edcce5b23c8305a2 SHA1 f9d22b48903f1f5c7f3ae885c6949c65827583b5 SHA256 92fbe981eda972767866b388548c1837dcc32b06549b2dcf3c44d8bfe62d398f
 MD5 9f528fa7b6b4d2c202ce5f4e3a5173ba files/chdir-4.6.0.gentoo 159
 RMD160 5edd511a40033bc11ed6e486edcce5b23c8305a2 files/chdir-4.6.0.gentoo 159
@@ -14,6 +17,10 @@ AUX mc-4.6.0-ebuild-syntax.patch 296 RMD160 adc93b215cb7d092226a8a6dc6d7eb1114d0
 MD5 6356abe34b8907ad2cfedd4cf8ef365e files/mc-4.6.0-ebuild-syntax.patch 296
 RMD160 adc93b215cb7d092226a8a6dc6d7eb1114d031fc files/mc-4.6.0-ebuild-syntax.patch 296
 SHA256 18787cc1605326aea8e71573780c02992e31404bde79b02b63ca1d2bb14a5aef files/mc-4.6.0-ebuild-syntax.patch 296
+AUX mc-4.6.1-bash-all.patch 926 RMD160 9883d81179cbf39ef05769cdbe24928f173abe02 SHA1 f13fbfcb6bd9ad3cb3eea5086e083f43c0db179d SHA256 d825b4654da8819e352b5ff49225323fb6b6e8695ad322ec6b5cdec7110312da
+MD5 d0c5d1f7258daf2a86b41b185524dced files/mc-4.6.1-bash-all.patch 926
+RMD160 9883d81179cbf39ef05769cdbe24928f173abe02 files/mc-4.6.1-bash-all.patch 926
+SHA256 d825b4654da8819e352b5ff49225323fb6b6e8695ad322ec6b5cdec7110312da files/mc-4.6.1-bash-all.patch 926
 AUX mc-4.6.1-find.patch 5522 RMD160 edba65b5c797d4ac1a4230c24d5746c8f5d06664 SHA1 7611f81a9f69ba3e62931f73fa0bfd56a5706e10 SHA256 70afc16da05d7d10bc1965039090546856692ed6013acf51b2a9d9ca85ed6868
 MD5 3c950491cdf44091df216cfa709d133a files/mc-4.6.1-find.patch 5522
 RMD160 edba65b5c797d4ac1a4230c24d5746c8f5d06664 files/mc-4.6.1-find.patch 5522
@@ -43,14 +50,18 @@ EBUILD mc-4.6.1-r2.ebuild 3856 RMD160 3428e2f28202985dcbc076a9c41883684ce78150 S
 MD5 c1297e48c17504db25905c1c6deecb11 mc-4.6.1-r2.ebuild 3856
 RMD160 3428e2f28202985dcbc076a9c41883684ce78150 mc-4.6.1-r2.ebuild 3856
 SHA256 8111b95340ee7a794f90d9ffe639e41be7e9557513377cee17f72274540b789c mc-4.6.1-r2.ebuild 3856
+EBUILD mc-4.6.1-r3.ebuild 3898 RMD160 34af32deecc6a9c36b3fd3e19aabfd065c1dc4dd SHA1 975a600b9e265bacde84b3ee0d029254c76adba6 SHA256 ae278304fb66eaf2d0d28850bbbd05677f1bece4e69b023608b72dec75596722
+MD5 7a1b00f6b1bb494e4a77da8929bb1edc mc-4.6.1-r3.ebuild 3898
+RMD160 34af32deecc6a9c36b3fd3e19aabfd065c1dc4dd mc-4.6.1-r3.ebuild 3898
+SHA256 ae278304fb66eaf2d0d28850bbbd05677f1bece4e69b023608b72dec75596722 mc-4.6.1-r3.ebuild 3898
 EBUILD mc-4.6.1.ebuild 3559 RMD160 4ee8d3db948c59834a2eb1904d2d33b10c99fe56 SHA1 cb026fdcd7f25615d4c9bd7d24ffa5aee8120f8c SHA256 6112ca92f85f292a9f8a27d7142fde444c670daa0e25af98f0715888e4d62f47
 MD5 b59816ddb22cba888c093d4aa4e0d525 mc-4.6.1.ebuild 3559
 RMD160 4ee8d3db948c59834a2eb1904d2d33b10c99fe56 mc-4.6.1.ebuild 3559
 SHA256 6112ca92f85f292a9f8a27d7142fde444c670daa0e25af98f0715888e4d62f47 mc-4.6.1.ebuild 3559
-MISC ChangeLog 16440 RMD160 bd5cd3fc9308dd9ba2804b29819e5f812c637d0a SHA1 06cee554a6ec45490cbf621fb3e88115778e8db1 SHA256 7fa8cf76b73a39430b08030ec1fcfa3a0b10823200c4cf5564a11388f913414a
-MD5 c6523f1f65a0fbedb311e601800ab3dc ChangeLog 16440
-RMD160 bd5cd3fc9308dd9ba2804b29819e5f812c637d0a ChangeLog 16440
-SHA256 7fa8cf76b73a39430b08030ec1fcfa3a0b10823200c4cf5564a11388f913414a ChangeLog 16440
+MISC ChangeLog 16662 RMD160 0e7132471746192cbb22c7f07fa6aa84acbb86e4 SHA1 71f7e2b23ba8d9bae3aaeb146cc63426baebf14b SHA256 0bfdd83a426664de15a12bf629e691be431cf0ad3b86505429aeb83c08dc72b5
+MD5 fb820cc93ea92279a89f10ce16400fb6 ChangeLog 16662
+RMD160 0e7132471746192cbb22c7f07fa6aa84acbb86e4 ChangeLog 16662
+SHA256 0bfdd83a426664de15a12bf629e691be431cf0ad3b86505429aeb83c08dc72b5 ChangeLog 16662
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
 MD5 4eda2fda81ea6a89d8f1f4a2dcd12a85 metadata.xml 233
 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 metadata.xml 233
@@ -61,3 +72,13 @@ SHA256 b20f6209af8c836b2acba79723cf9854b69e0145a41af195932c947e2713123f files/di
 MD5 e44020f133c8e16d56784bd3ae21041e files/digest-mc-4.6.1-r2 708
 RMD160 b4f25a3be25edbcc6ba52ae2be1a087955b3db16 files/digest-mc-4.6.1-r2 708
 SHA256 f9ded44bd363c563a74300baf1026ec9e962cf1ab22376f4cba7281ac008b71a files/digest-mc-4.6.1-r2 708
+MD5 e44020f133c8e16d56784bd3ae21041e files/digest-mc-4.6.1-r3 708
+RMD160 b4f25a3be25edbcc6ba52ae2be1a087955b3db16 files/digest-mc-4.6.1-r3 708
+SHA256 f9ded44bd363c563a74300baf1026ec9e962cf1ab22376f4cba7281ac008b71a files/digest-mc-4.6.1-r3 708
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFWvNMz974XjDVpbkRAicbAJ0bv/9xferr+FCz7V9lq9HhY5xawwCfX9OB
+I8pKBC7cER70+aOv0tiSspk=
+=PPvi
+-----END PGP SIGNATURE-----
diff --git a/app-misc/mc/files/digest-mc-4.6.1-r3 b/app-misc/mc/files/digest-mc-4.6.1-r3
new file mode 100644
index 000000000000..baa6422df472
--- /dev/null
+++ b/app-misc/mc/files/digest-mc-4.6.1-r3
@@ -0,0 +1,9 @@
+MD5 6d7be5691380d03be44829e78a04e68a mc-4.6.1-utf8-r1.patch.bz2 30427
+RMD160 43f246e3bce44e526fb8d69c095afce34d73d64d mc-4.6.1-utf8-r1.patch.bz2 30427
+SHA256 19c8728220ec52849daded5d58eddbd712a2ccc84b11aed41c3916248545df44 mc-4.6.1-utf8-r1.patch.bz2 30427
+MD5 18b20db6e40480a53bac2870c56fc3c4 mc-4.6.1.tar.gz 3928370
+RMD160 d565ee95a8916d73fad5e0defeb9f2f57e50962b mc-4.6.1.tar.gz 3928370
+SHA256 086ab03daaac28a28c0ddb9a709040b59e1322f6bfa68e39d004d9c66b119e7e mc-4.6.1.tar.gz 3928370
+MD5 d63ffd21654bfa965b5c19b845cb7b34 u7z-4.29.tar.bz2 2951
+RMD160 1ab0cfea1563e81bdde9c0552d37efe710ea14bf u7z-4.29.tar.bz2 2951
+SHA256 0d046e76fade7c7e31be01626bb3fcb0afcb5f62809733d0c70e0e12c655348d u7z-4.29.tar.bz2 2951
diff --git a/app-misc/mc/files/mc-4.6.1-bash-all.patch b/app-misc/mc/files/mc-4.6.1-bash-all.patch
new file mode 100644
index 000000000000..e3e2afc344ca
--- /dev/null
+++ b/app-misc/mc/files/mc-4.6.1-bash-all.patch
@@ -0,0 +1,33 @@
+--- /src/subshell.c.000	2006-05-08 23:11:48.000000000 +0200
++++ /src/subshell.c	2006-10-28 15:40:46.000000000 +0200
+@@ -745,29 +745,13 @@ subshell_name_quote (const char *s)
+     memcpy (d, cmd_start, len);
+     d += len;
+ 
+-    /*
+-     * Print every character in octal format with the leading backslash.
+-     * tcsh and zsh may require 4-digit octals, bash < 2.05b doesn't like them.
+-     */
+-    if (subshell_type == BASH) {
+ 	for (; *s; s++) {
+-	    /* Must quote numbers, so that they are not glued to octals */
+ 	    if (isalpha ((unsigned char) *s)) {
+ 		*d++ = (unsigned char) *s;
+ 	    } else {
+-		sprintf (d, "\\%03o", (unsigned char) *s);
+-		d += 4;
+-	    }
+-	}
+-    } else {
+-	for (; *s; s++) {
+-	    if (isalnum ((unsigned char) *s)) {
+-		*d++ = (unsigned char) *s;
+-	    } else {
+ 		sprintf (d, "\\0%03o", (unsigned char) *s);
+ 		d += 5;
+ 	    }
+-	}
+     }
+ 
+     memcpy (d, common_end, sizeof (common_end));
+
diff --git a/app-misc/mc/mc-4.6.1-r3.ebuild b/app-misc/mc/mc-4.6.1-r3.ebuild
new file mode 100644
index 000000000000..6c37e2114a65
--- /dev/null
+++ b/app-misc/mc/mc-4.6.1-r3.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.1-r3.ebuild,v 1.1 2006/11/15 11:00:22 jokey Exp $
+
+inherit flag-o-matic eutils
+
+U7Z_PV="4.29"
+U7Z="u7z-${U7Z_PV}.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
+	mirror://gentoo/${P}-utf8-r1.patch.bz2
+	7zip? ( http://sgh-punk.narod.ru/files/u7z/${U7Z} )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="7zip X gpm ncurses nls pam samba slang unicode"
+
+PROVIDE="virtual/editor"
+
+RDEPEND="kernel_linux? ( >=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 )
+	samba? ( >=net-fs/samba-3.0.0 )
+	X? ( || ( (
+			x11-libs/libX11
+			x11-libs/libICE
+			x11-libs/libXau
+			x11-libs/libXdmcp
+			x11-libs/libSM
+			)
+			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 ${FILESDIR}/${P}-find.patch
+	if ( use x86 || use amd64 || use ppc ) && use 7zip; then
+		epatch ${FILESDIR}/${PN}-4.6.0-7zip.patch
+	fi
+	epatch ${FILESDIR}/${P}-largefile.patch
+	if use slang && use unicode; then
+		epatch ${DISTDIR}/${P}-utf8-r1.patch.bz2
+	fi
+	epatch ${FILESDIR}/${P}-nonblock.patch
+	epatch ${FILESDIR}/${P}-bash-all.patch
+
+	# Prevent lazy bindings in cons.saver binary. (bug #135009)
+	#  - not using bindnow-flags() because cons.saver is only built on GNU/Linux
+	sed -i -e "s:^\(cons_saver_LDADD = .*\):\1 -Wl,-z,now:" \
+		src/Makefile.in
+}
+
+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-ext2undel \
+	    --with-edit \
+		--enable-charset \
+	    ${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	 cat ${FILESDIR}/chdir-4.6.0.gentoo >>\
+		 ${S}/lib/mc-wrapper.sh
+
+	make install DESTDIR="${D}" || 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}/${PN}-4.6.0-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"
+}