Update the utf8 patch to the latest debian version to fix a compile error, bug

#140802. Bump u7z extension.

Package-Manager: portage-2.1.1_pre3-r1

4 files changed, 175 insertions, 15 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 64de04b890e8..7cf6813703a1 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.107 2006/07/27 23:51:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.108 2006/08/02 09:07:59 exg Exp $
+
+*mc-4.6.1-r2 (02 Aug 2006)
+
+  02 Aug 2006; Emanuele Giaquinta <exg@gentoo.org> +mc-4.6.1-r2.ebuild:
+  Update the utf8 patch to the latest debian version to fix a compile error, bug
+  #140802. Bump u7z extension.
 
   27 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> mc-4.6.1.ebuild,
   mc-4.6.1-r1.ebuild:
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 295359aeb717..6938adb50ff9 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,6 +1,3 @@
------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
@@ -37,21 +34,27 @@ AUX mc.ini 43 RMD160 2254610744c484553cd3332a4f45e439b13cceed SHA1 dde4fa7bc4486
 MD5 7fadf4867e255f1d7254181267759775 files/mc.ini 43
 RMD160 2254610744c484553cd3332a4f45e439b13cceed files/mc.ini 43
 SHA256 ed0921487e74b913fa34f4d672584b64da6cf5d592b17c65328621934a4d46f1 files/mc.ini 43
+DIST mc-4.6.1-utf8-r1.patch.bz2 30427 RMD160 43f246e3bce44e526fb8d69c095afce34d73d64d SHA1 5ed1468a55c6984b520eec8a8f8cb48cad1e6f91 SHA256 19c8728220ec52849daded5d58eddbd712a2ccc84b11aed41c3916248545df44
 DIST mc-4.6.1-utf8.patch.bz2 30401 RMD160 f23680c85328b4b0435065f9e5cf430e0cd6b0c4 SHA1 f773e13d4ee601fdd0220b589acf32eeaf66b71e SHA256 dbc0f41059c4010665027d6ab756c4ca6d65584bcfb771afa120da3219e8e61b
 DIST mc-4.6.1.tar.gz 3928370 RMD160 d565ee95a8916d73fad5e0defeb9f2f57e50962b SHA1 92be0802143245e0fb7e3847d70da614cad7d5fb SHA256 086ab03daaac28a28c0ddb9a709040b59e1322f6bfa68e39d004d9c66b119e7e
 DIST u7z-4.16beta.tar.bz2 3041 RMD160 4a682b3b4bc6c09c7414f8d585829763f6c112ea SHA1 5a4898c732ee423bbf9bd38d3b6f0ebab655881c SHA256 668ed6a0484358e51de1be8d8581cc36dd3c915872fb1082550437a2d7aa67dd
+DIST u7z-4.29.tar.bz2 2951 RMD160 1ab0cfea1563e81bdde9c0552d37efe710ea14bf SHA1 1a8c65dcb58a8f1be9d7fa8a3b91b1819fbb3360 SHA256 0d046e76fade7c7e31be01626bb3fcb0afcb5f62809733d0c70e0e12c655348d
 EBUILD mc-4.6.1-r1.ebuild 3840 RMD160 5e4f7ce7130d2edd3137d194c8913fd2156b572a SHA1 076c5cdffa2a8f5e518c624b9907ed04eb01b2b2 SHA256 9aa410bc0bec5b0d657ecd98bc2bcbd5226df1a8e9363d6be96da7e8e65c9545
 MD5 40872a695b897c1894f63143f0ec2b43 mc-4.6.1-r1.ebuild 3840
 RMD160 5e4f7ce7130d2edd3137d194c8913fd2156b572a mc-4.6.1-r1.ebuild 3840
 SHA256 9aa410bc0bec5b0d657ecd98bc2bcbd5226df1a8e9363d6be96da7e8e65c9545 mc-4.6.1-r1.ebuild 3840
+EBUILD mc-4.6.1-r2.ebuild 3834 RMD160 13b4b923e780732009a679d9ce072f75508fd5e1 SHA1 924a3305ee594ae14e67b5452cf211c3546ad539 SHA256 7b7d38e8f45cc4ac50abae9025ec5c3eec2bebf6192930e71fcb48a7942a59da
+MD5 2e4facc43cb2c8316be15219daee19ab mc-4.6.1-r2.ebuild 3834
+RMD160 13b4b923e780732009a679d9ce072f75508fd5e1 mc-4.6.1-r2.ebuild 3834
+SHA256 7b7d38e8f45cc4ac50abae9025ec5c3eec2bebf6192930e71fcb48a7942a59da mc-4.6.1-r2.ebuild 3834
 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 15935 RMD160 695d77591d606d09522ff25a74ab84d99350015c SHA1 9b9d1df3634bd9587619b2978f1056914579c9d3 SHA256 7c8004420008789f929cbdaec9fb1da32c0978354d9fa3200cc0a5058329e78a
-MD5 726018cbc2d757fa6f5a48bc4e5b7f1b ChangeLog 15935
-RMD160 695d77591d606d09522ff25a74ab84d99350015c ChangeLog 15935
-SHA256 7c8004420008789f929cbdaec9fb1da32c0978354d9fa3200cc0a5058329e78a ChangeLog 15935
+MISC ChangeLog 16142 RMD160 da3f958ceecbfd2a2f13172222c9715210e0edc7 SHA1 c75a9463cbb76f078b8b960991b944720f3eb9ab SHA256 823e2561ef7fc6014773c381611898697196fff3291529b5609fd35fa679604c
+MD5 f2cb141964ff26738f2156b9804005b9 ChangeLog 16142
+RMD160 da3f958ceecbfd2a2f13172222c9715210e0edc7 ChangeLog 16142
+SHA256 823e2561ef7fc6014773c381611898697196fff3291529b5609fd35fa679604c ChangeLog 16142
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
 MD5 4eda2fda81ea6a89d8f1f4a2dcd12a85 metadata.xml 233
 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 metadata.xml 233
@@ -62,10 +65,6 @@ SHA256 b20f6209af8c836b2acba79723cf9854b69e0145a41af195932c947e2713123f files/di
 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.4 (GNU/Linux)
-
-iD8DBQFEyVGEAiZjviIA2XgRAvPWAJ4kZJjzEfj4eCAHxNNyj6qSvFZe9QCfeWCm
-rF/XQJV9OnKKg4VxqR/EtRo=
-=km1J
------END PGP SIGNATURE-----
+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
diff --git a/app-misc/mc/files/digest-mc-4.6.1-r2 b/app-misc/mc/files/digest-mc-4.6.1-r2
new file mode 100644
index 000000000000..baa6422df472
--- /dev/null
+++ b/app-misc/mc/files/digest-mc-4.6.1-r2
@@ -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/mc-4.6.1-r2.ebuild b/app-misc/mc/mc-4.6.1-r2.ebuild
new file mode 100644
index 000000000000..6700bce2f368
--- /dev/null
+++ b/app-misc/mc/mc-4.6.1-r2.ebuild
@@ -0,0 +1,146 @@
+# 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-r2.ebuild,v 1.1 2006/08/02 09:07:59 exg 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.patch.bz2
+	fi
+	epatch ${FILESDIR}/${P}-nonblock.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
+
+	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"
+}