Add patch, thanks to hansmi, to fix bug #127411.

Package-Manager: portage-2.1_pre10-r2

5 files changed, 187 insertions, 9 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 1aa6927e4b30..722fc5f304a5 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.100 2006/04/27 13:17:17 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.101 2006/05/03 14:47:46 exg Exp $
+
+*mc-4.6.1-r1 (03 May 2006)
+
+  03 May 2006; Emanuele Giaquinta <exg@gentoo.org>
+  +files/mc-4.6.1-nonblock.patch, +mc-4.6.1-r1.ebuild:
+  Add patch, thanks to hansmi, to fix bug #127411.
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org> files/digest-mc-4.6.0-r12,
   files/digest-mc-4.6.0-r13, files/digest-mc-4.6.0-r14,
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index abdcf26c495c..1759baeffd90 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -61,6 +61,10 @@ AUX mc-4.6.1-largefile.patch 6919 RMD160 f6bcb19aed609d89a0fdf36646b991d13f45f1c
 MD5 80b45ecf38d9b5df6d368c83d14fd89d files/mc-4.6.1-largefile.patch 6919
 RMD160 f6bcb19aed609d89a0fdf36646b991d13f45f1ca files/mc-4.6.1-largefile.patch 6919
 SHA256 005bbc46f6b4ee3ff8ce29cf1b8974af69e38b4ca5676512927a3a8cd290ee57 files/mc-4.6.1-largefile.patch 6919
+AUX mc-4.6.1-nonblock.patch 394 RMD160 414e6d99045ad73d3634e135892d1615cb3322fd SHA1 34b3e6d4807c9e055dbafeede0ed3aa74efe7224 SHA256 49487dbe67eef61543ca9d36f81d2d8884787d2c18dd7ca90ba032ef0ed3c10e size 394
+MD5 00e89cfc43fe6026b61f52b218a65907 files/mc-4.6.1-nonblock.patch 394
+RMD160 414e6d99045ad73d3634e135892d1615cb3322fd files/mc-4.6.1-nonblock.patch 394
+SHA256 49487dbe67eef61543ca9d36f81d2d8884787d2c18dd7ca90ba032ef0ed3c10e files/mc-4.6.1-nonblock.patch 394
 AUX mc.gentoo 322 RMD160 957d5127be68de3eca20ac3121607faa1370d997 SHA1 c13e3625613764aa7c06aaba4519efa30c5722c1 SHA256 6dff61a04bf35cbc5c9570e3ad194a8d8ffd255096c977997d11aa59cd0f24c9 size 322
 MD5 835695dda387b59a2497658f3f5af1d5 files/mc.gentoo 322
 RMD160 957d5127be68de3eca20ac3121607faa1370d997 files/mc.gentoo 322
@@ -89,14 +93,18 @@ EBUILD mc-4.6.0-r14.ebuild 4081 RMD160 31f544912eea155c0716f87da9f798ac4c2d3328
 MD5 da0e80d1aa4cd507e06461fb59049a18 mc-4.6.0-r14.ebuild 4081
 RMD160 31f544912eea155c0716f87da9f798ac4c2d3328 mc-4.6.0-r14.ebuild 4081
 SHA256 b2b14b5120ff0b0e76e788facf7265857d3b334845bc3cc7d2e0101d224f04a8 mc-4.6.0-r14.ebuild 4081
+EBUILD mc-4.6.1-r1.ebuild 3611 RMD160 1fe704fad0aab1a43930e536660dfec297013bd2 SHA1 9939e33810d9e31ed2f122dabc7002e4164e12ac SHA256 f294e2a5640e14583f6c7b6ff3077dee7caf53382c71bbbb598b5eea3f91b715 size 3611
+MD5 7027d3c6cef208513034fcc65170f830 mc-4.6.1-r1.ebuild 3611
+RMD160 1fe704fad0aab1a43930e536660dfec297013bd2 mc-4.6.1-r1.ebuild 3611
+SHA256 f294e2a5640e14583f6c7b6ff3077dee7caf53382c71bbbb598b5eea3f91b715 mc-4.6.1-r1.ebuild 3611
 EBUILD mc-4.6.1.ebuild 3563 RMD160 1be67935d1ba7170822bf59e9a60974686eb0ad2 SHA1 8ed0334ae0d81337895299cefaabee91a331113f SHA256 4e1957c422452c781b8ff586fe30dac6de1f461cc9669f20d6320758c7d0ed29 size 3563
 MD5 3ed63cc3cb04c0bb19123cd4c09abc2c mc-4.6.1.ebuild 3563
 RMD160 1be67935d1ba7170822bf59e9a60974686eb0ad2 mc-4.6.1.ebuild 3563
 SHA256 4e1957c422452c781b8ff586fe30dac6de1f461cc9669f20d6320758c7d0ed29 mc-4.6.1.ebuild 3563
-MISC ChangeLog 14697 RMD160 55d5a15cdeceb5fa6bb6c600a46d4f5f1b4ff96d SHA1 2e1939012fbac2c11f01debeb84b54d9d4ea1c92 SHA256 17967b79bd92559a5401b98573640cf3b915a322596b794bca4cae2b785e8b4d size 14697
-MD5 131e1b26612764cb2aba56bb3c7a4c08 ChangeLog 14697
-RMD160 55d5a15cdeceb5fa6bb6c600a46d4f5f1b4ff96d ChangeLog 14697
-SHA256 17967b79bd92559a5401b98573640cf3b915a322596b794bca4cae2b785e8b4d ChangeLog 14697
+MISC ChangeLog 14879 RMD160 d0971d4fdb6cdcf193bb79e127768d15568cd367 SHA1 8fec7bb0e61d7a55ab282756c6e3ad3a45147095 SHA256 459356be85a7da8e9193ec79fd43eb5da9ced72953230194ddaaa460c500c1dd size 14879
+MD5 b21b11cdc9f376471b4656cb41758613 ChangeLog 14879
+RMD160 d0971d4fdb6cdcf193bb79e127768d15568cd367 ChangeLog 14879
+SHA256 459356be85a7da8e9193ec79fd43eb5da9ced72953230194ddaaa460c500c1dd ChangeLog 14879
 MISC metadata.xml 253 RMD160 bfa92d311ac4e8cc9a2190f578925f333ae096a8 SHA1 3a8933b91cfe570a857153b2774464411b845b7d SHA256 8e0389110e0cd8cc331b484cde34c22dd93f9f49df16c2263eea4d8e84093976 size 253
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 RMD160 bfa92d311ac4e8cc9a2190f578925f333ae096a8 metadata.xml 253
@@ -113,10 +121,13 @@ SHA256 e5784b344ae824f91979ddaad2e4533ace1d02b8a3bf29111ffcbecd345ce9b8 files/di
 MD5 3ef06152e915e8603f9064ee6ee375b4 files/digest-mc-4.6.1 711
 RMD160 87bbf5334901ba270ce42c175c8fdd35f05982c1 files/digest-mc-4.6.1 711
 SHA256 b20f6209af8c836b2acba79723cf9854b69e0145a41af195932c947e2713123f files/digest-mc-4.6.1 711
+MD5 3ef06152e915e8603f9064ee6ee375b4 files/digest-mc-4.6.1-r1 711
+RMD160 87bbf5334901ba270ce42c175c8fdd35f05982c1 files/digest-mc-4.6.1-r1 711
+SHA256 b20f6209af8c836b2acba79723cf9854b69e0145a41af195932c947e2713123f files/digest-mc-4.6.1-r1 711
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEUMRkW78445TWHXcRAgHtAJ9+EVmCF+CB/Odw8HER+Qq7UIfuowCfc1SL
-E/tlhif6t8OJfVdJVuQkJRY=
-=1Sk7
+iD8DBQFEWMH62iXjgNjfe5sRAhOnAJ9DGsniUxJ60KdaoXDgkq/scye5wACbBhnn
+kzmUYSQpZOg42iNbyzpPOB8=
+=wMLL
 -----END PGP SIGNATURE-----
diff --git a/app-misc/mc/files/digest-mc-4.6.1-r1 b/app-misc/mc/files/digest-mc-4.6.1-r1
new file mode 100644
index 000000000000..17b4ba9611d2
--- /dev/null
+++ b/app-misc/mc/files/digest-mc-4.6.1-r1
@@ -0,0 +1,9 @@
+MD5 becd9c9ecefbaed5bfb453cad2e4725a mc-4.6.1-utf8.patch.bz2 30401
+RMD160 f23680c85328b4b0435065f9e5cf430e0cd6b0c4 mc-4.6.1-utf8.patch.bz2 30401
+SHA256 dbc0f41059c4010665027d6ab756c4ca6d65584bcfb771afa120da3219e8e61b mc-4.6.1-utf8.patch.bz2 30401
+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 60a8e4524554a550472622db7fcf728f u7z-4.16beta.tar.bz2 3041
+RMD160 4a682b3b4bc6c09c7414f8d585829763f6c112ea u7z-4.16beta.tar.bz2 3041
+SHA256 668ed6a0484358e51de1be8d8581cc36dd3c915872fb1082550437a2d7aa67dd u7z-4.16beta.tar.bz2 3041
diff --git a/app-misc/mc/files/mc-4.6.1-nonblock.patch b/app-misc/mc/files/mc-4.6.1-nonblock.patch
new file mode 100644
index 000000000000..eca34aaf5289
--- /dev/null
+++ b/app-misc/mc/files/mc-4.6.1-nonblock.patch
@@ -0,0 +1,11 @@
+--- mc-4.6.1/src/cons.saver.c.old	2006-04-30 20:45:11.725128977 +0200
++++ mc-4.6.1/src/cons.saver.c	2006-04-30 20:45:55.545063247 +0200
+@@ -134,7 +134,7 @@
+ 
+   if (seteuid (uid) < 0)
+     die ();
+-  console_fd = open (tty_name, O_RDONLY);
++  console_fd = open (tty_name, O_RDONLY | O_NONBLOCK);
+   if (console_fd < 0)
+     die ();
+   if (fstat (console_fd, &st) < 0 || ! S_ISCHR (st.st_mode))
diff --git a/app-misc/mc/mc-4.6.1-r1.ebuild b/app-misc/mc/mc-4.6.1-r1.ebuild
new file mode 100644
index 000000000000..295ba8abfd2d
--- /dev/null
+++ b/app-misc/mc/mc-4.6.1-r1.ebuild
@@ -0,0 +1,141 @@
+# 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-r1.ebuild,v 1.1 2006/05/03 14:47:46 exg 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
+	mirror://gentoo/${P}-utf8.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 ~sh ~sparc ~x86"
+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-r1 )
+	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.patch.bz2
+	fi
+	epatch ${FILESDIR}/${P}-nonblock.patch
+}
+
+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
+
+	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}/${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"
+}