Upstream patch for undelfs configure flag.

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

4 files changed, 31 insertions, 6 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 191eca561550..41e40c3980f0 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/mc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.154 2009/08/03 11:00:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.155 2009/08/05 12:22:28 ssuominen Exp $
+
+  05 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> mc-4.7.0_pre1.ebuild,
+  +files/mc-4.7.0_pre1-undelfs_configure.patch:
+  Upstream patch for undelfs configure flag.
 
   03 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> mc-4.7.0_pre1.ebuild,
   +files/mc-4.7.0_pre1-tbz2_filetype.patch:
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index a05cbc791c46..82f555d5d9da 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -10,6 +10,7 @@ AUX mc-4.6.1-largefile.patch 6919 RMD160 f6bcb19aed609d89a0fdf36646b991d13f45f1c
 AUX mc-4.6.1-nonblock.patch 394 RMD160 414e6d99045ad73d3634e135892d1615cb3322fd SHA1 34b3e6d4807c9e055dbafeede0ed3aa74efe7224 SHA256 49487dbe67eef61543ca9d36f81d2d8884787d2c18dd7ca90ba032ef0ed3c10e
 AUX mc-4.7.0_pre1-ebuild_syntax.patch 1352 RMD160 603d62336c00e85712bfbef03218340f27b00074 SHA1 777a58895a67c6c11b6530129eb13ea5a9647eb0 SHA256 0cdc301345fb324df90827fb0c3e32f144a5babb19cd8b1d5ac673d47b0b8e10
 AUX mc-4.7.0_pre1-tbz2_filetype.patch 564 RMD160 c039c1b8c61c4757b73e61fa5baae5bf9eca2542 SHA1 2db984784143e508348d22d1cb53ed27b83f5e24 SHA256 cfe64f0ed7e7388398c5313026dc432585f6fb386e4be6bd7ec8f881cdedb06c
+AUX mc-4.7.0_pre1-undelfs_configure.patch 757 RMD160 5f5b65c7d5cde6bff56a8cae0e1725c31dc064a2 SHA1 1ce39e2b7ff2a499d8de0ba85fcd346e9518fba0 SHA256 9dbbf46d6dcf694cd2d831ffb127a15d0f39c866ff5e16e6fa4d3fae9be4b5fc
 AUX mc.gentoo 322 RMD160 957d5127be68de3eca20ac3121607faa1370d997 SHA1 c13e3625613764aa7c06aaba4519efa30c5722c1 SHA256 6dff61a04bf35cbc5c9570e3ad194a8d8ffd255096c977997d11aa59cd0f24c9
 AUX mc.ini 43 RMD160 2254610744c484553cd3332a4f45e439b13cceed SHA1 dde4fa7bc44867f9e1b34e170aec07484e8497dc SHA256 ed0921487e74b913fa34f4d672584b64da6cf5d592b17c65328621934a4d46f1
 DIST mc-4.6.1-utf8-r2.patch.bz2 30449 RMD160 ffe89eb0cef217ba87398c93b65ebc0e5fefac5d SHA1 f0994ddc412b4f86a7dab83686e846156fc36de2 SHA256 f58de9e412694958c00c7ef831995f2b56b7add7ea1e26567281516db02f483e
@@ -17,6 +18,6 @@ DIST mc-4.6.1.tar.gz 3928370 RMD160 d565ee95a8916d73fad5e0defeb9f2f57e50962b SHA
 DIST mc-4.7.0-pre1.tar.bz2 2783935 RMD160 0f63d2a3b30af097697ae5fb715bb04249877e9b SHA1 028dcdc998f012445cb9a3c707f9411bbe46ac65 SHA256 a774ff52ef9ba4654e3bf48081f4775ad90fb4d86f1670d6a3a6804d090213ef
 DIST u7z-4.29.tar.bz2 2951 RMD160 1ab0cfea1563e81bdde9c0552d37efe710ea14bf SHA1 1a8c65dcb58a8f1be9d7fa8a3b91b1819fbb3360 SHA256 0d046e76fade7c7e31be01626bb3fcb0afcb5f62809733d0c70e0e12c655348d
 EBUILD mc-4.6.1-r4.ebuild 4435 RMD160 3fb4884c84cea9ebc1d25712c5cfd82f4cd32a83 SHA1 8299104edf60b0b62ba8b565a88c003029f0c6b2 SHA256 92a93a2dbf14c086a9a0684f813a7d7b05e58835ba1969bae4b7f8f94aa3f315
-EBUILD mc-4.7.0_pre1.ebuild 1482 RMD160 decfd91d941e1233b30a3e41756cdb7b4a2dcdf5 SHA1 90ccbf2ee5585af7559ab63c77b8e313115d4e4f SHA256 2cbaab8e34720ff880d22ddbe8a4f50b41c3b2c045593610ffc8d8d0a233d7df
-MISC ChangeLog 21832 RMD160 35397f769f49108e92e256d64b36a6a6b452f8d9 SHA1 ae8f8d5f5631af0ce03fb49363775785a3a819ad SHA256 cb3fe8413eecb236e1e95c4591621d2f1dd373da20323d3a70bdd113a6c66578
+EBUILD mc-4.7.0_pre1.ebuild 1635 RMD160 8b3f54c97cad382aa3c64e411a82ec1ed92eefbf SHA1 fc6b456efd135b9de770f1c3b35b763147b0eaa9 SHA256 5af5ac2654cd11303dd81b0e208a2b32c703b9bb6119554d37f6b44fc57f0587
+MISC ChangeLog 22002 RMD160 6c57820063240f280e3e98a667df6d3759b948b3 SHA1 dd9892af3c6042fd5bb482326b3279c8a6d06a4f SHA256 52be0ce68b35cf50d80fb7e624f94f06077c817e89b6b0b841ac638e41cd7535
 MISC metadata.xml 300 RMD160 9f102fd6d3f520bc53b394229456e9b70e91807f SHA1 020bf4ff7b164e352b8340434ed3762430db87bc SHA256 f1f97640f02ba1eca452c927887656187f24f40a0f8ba97223dcbedb21497ef5
diff --git a/app-misc/mc/files/mc-4.7.0_pre1-undelfs_configure.patch b/app-misc/mc/files/mc-4.7.0_pre1-undelfs_configure.patch
new file mode 100644
index 000000000000..e2bc8d71c85b
--- /dev/null
+++ b/app-misc/mc/files/mc-4.7.0_pre1-undelfs_configure.patch
@@ -0,0 +1,16 @@
+http://www.midnight-commander.org/ticket/1459
+
+Patch from upstream git
+
+diff -ur mc-4.7.0-pre1.orig/configure.ac mc-4.7.0-pre1/configure.ac
+--- mc-4.7.0-pre1.orig/configure.ac	2009-07-31 19:36:24.000000000 +0300
++++ mc-4.7.0-pre1/configure.ac	2009-08-05 15:16:25.000000000 +0300
+@@ -535,7 +535,7 @@
+ AM_CONDITIONAL(USE_EDIT, [test -n "$use_edit"])
+ AM_CONDITIONAL(USE_VFS, [test "x$use_vfs" = xyes])
+ AM_CONDITIONAL(USE_VFS_NET, [test x"$use_net_code" = xtrue])
+-AM_CONDITIONAL(USE_UNDEL_FS, [test -n "$use_undelfs"])
++AM_CONDITIONAL(USE_UNDEL_FS, [test -n "$enable_vfs_undelfs"])
+ AM_CONDITIONAL(USE_SAMBA_FS, [test -n "$use_smbfs"])
+ AM_CONDITIONAL(ENABLE_MCSERVER, [test x"$enable_mcserver" = "xyes"])
+ AM_CONDITIONAL(CHARSET, [test -n "$have_charset"])
diff --git a/app-misc/mc/mc-4.7.0_pre1.ebuild b/app-misc/mc/mc-4.7.0_pre1.ebuild
index 391648f3a076..8ab73f02517b 100644
--- a/app-misc/mc/mc-4.7.0_pre1.ebuild
+++ b/app-misc/mc/mc-4.7.0_pre1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.0_pre1.ebuild,v 1.6 2009/08/03 11:00:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.0_pre1.ebuild,v 1.7 2009/08/05 12:22:28 ssuominen Exp $
 
 EAPI=2
-inherit eutils
+inherit autotools eutils
 
 MY_P=${P/_/-}
 
@@ -18,6 +18,7 @@ IUSE="gpm nls samba +slang X"
 
 RDEPEND=">=dev-libs/glib-2.6:2
 	gpm? ( sys-libs/gpm )
+	kernel_linux? ( sys-fs/e2fsprogs )
 	samba? ( net-fs/samba )
 	slang? ( >=sys-libs/slang-2 )
 	!slang? ( sys-libs/ncurses )
@@ -34,7 +35,9 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-ebuild_syntax.patch \
-		"${FILESDIR}"/${P}-tbz2_filetype.patch
+		"${FILESDIR}"/${P}-tbz2_filetype.patch \
+		"${FILESDIR}"/${P}-undelfs_configure.patch
+	AT_NO_RECURSIVE="yes" eautoreconf
 }
 
 src_configure() {
@@ -45,6 +48,7 @@ src_configure() {
 	econf \
 		--disable-dependency-tracking \
 		--enable-vfs \
+		--enable-vfs-undelfs \
 		--enable-charset \
 		$(use_with X x) \
 		$(use_with samba) \