Upstream fix for build failure on MacOSX and various xBSDs (bug #395135 by Denis I. Polukarov). Removed old.

Package-Manager: portage-2.2.0_alpha84_p18/cvs/Linux x86_64

6 files changed, 69 insertions, 104 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 033dbce28a1e..d4c2914dc73a 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/mc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.237 2012/01/25 18:56:16 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.238 2012/01/27 20:26:43 slyfox Exp $
+
+*mc-4.8.1-r2 (27 Jan 2012)
+
+  27 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/mc-4.8.1-fix-fallocate-xBSD.patch, +mc-4.8.1-r2.ebuild,
+  -mc-4.7.5.5.ebuild, -mc-4.8.0-r2.ebuild, mc-9999.ebuild:
+  Upstream fix for build failure on MacOSX and various xBSDs (bug #395135 by
+  Denis I. Polukarov). Removed old.
 
   25 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org> mc-9999.ebuild:
   Fixed dangling symlinks in doc/ after install by Andrew Savchenko (bug
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 820281b11e8e..bf740e2826e2 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -3,27 +3,25 @@ Hash: SHA1
 
 AUX mc-4.8.0-fix-ftp-spaces.patch 1047 RMD160 8bfc6c0ffdcaded6a7f1382f0fee80d78fb928f0 SHA1 d6e1f843ce85a7351fd485cc6ec141ecd2a9c9fc SHA256 4285ba9907b4460739802876e39c8e2df858264214ef81ed8c2291b22f039515
 AUX mc-4.8.0-fix-nls.patch 949 RMD160 24627543ec6744b1b1d710a306dce4d5782e360e SHA1 d70b0ec63f65b72e414efcac2cc04e75740848d1 SHA256 504856248f6c3ab21870c7555f31cdcd9ac509c883ab6cc2929440fb9d1e2216
+AUX mc-4.8.1-fix-fallocate-xBSD.patch 944 RMD160 0ec606fcbc4ea4e26f96e413bfc373a6cb6289f4 SHA1 92ecfa2169f2dc386ea77d2261fda09fd962fb38 SHA256 aa64c6187b18a52944837bb22c660ae56a2b11877d20a045c5cca0d875e61d05
 DIST mc-4.7.0.10.tar.bz2 2862849 RMD160 83a527a94a81f886eb7f80b8965554bf927cad65 SHA1 2bc13f963780eaddac2f675b9145656d759f974e SHA256 99136c447a718c6bd681cb0f7d3ab9df4f5494d35cb3682f01ccf004873e56fb
 DIST mc-4.7.0.3.tar.bz2 2793651 RMD160 ecda5e6befe4b1e0442044b732e7903b01ed73ae SHA1 2d319fc940283e4327cd5bc2f977b724461f1305 SHA256 71caeaf00606c45228362fb6a4d2f1b6d47b6c1056db46b975255aac5af45ef7
 DIST mc-4.7.5.2.tar.lzma 1943321 RMD160 8477450d0f2cddc356d93c5006fcfd278966f863 SHA1 fb44d01a80c5e4589aece205adccff5b5a5c34c1 SHA256 ca362c629ea984b635e38e0912ec3a7ceb44facc18f0c17c17d6a114c14e7c26
-DIST mc-4.7.5.5.tar.xz 1991540 RMD160 6a5ab7edeaa1478a98446b11fbe0d3836beefbeb SHA1 83f09ccee88d8a0ff36e4c672bf6df3591a3e0fc SHA256 1ec5e711e7de01d9317a444061ab0d3c91bb84d8898dbbc99c7c472d6afbe2ea
 DIST mc-4.7.5.6.tar.xz 1995148 RMD160 605169df7f16e006a7889025852056041c4afd93 SHA1 3773da724813e6d93e4178850a03bc0f501f4b12 SHA256 8fc20859eac824b062fb2862429579b75cdbfb8d9011f1a7793d516550af4ffd
-DIST mc-4.8.0.tar.xz 2041108 RMD160 5aaa3efdc1274e58dd0be1b3f88c20d04b2dcf2c SHA1 245c5a75283507bc5bd58a983e8296ef45ec1efd SHA256 73b7169445bf628e783696b44860d908f97877618ae22039bcb8829ac38e23c1
 DIST mc-4.8.1.tar.xz 2057960 RMD160 db2d44cffd1e78c1f85a946ebb314542a526d82d SHA1 873b35ebe3f48a661f7d49a988464ac18d40647d SHA256 3a734a12940e7f7db5b93a45823266c5ec2582838ac7d62c681283c1b0a8b672
 EBUILD mc-4.7.0.10.ebuild 1920 RMD160 8f3ef7092e656e806c7252fdd54f5e8c066316fc SHA1 72710e8c6a105a98071fea1c2402d8b5d16fac38 SHA256 4b63687f1d1ebaefdc17d5bb8e97d0477e495690585950f43f78d844500f4f02
 EBUILD mc-4.7.0.3.ebuild 1706 RMD160 47509be466b4c9cb659cbaee63ac3f4919802b30 SHA1 7e81b7de80a5b28b9f458a25f9c7f4e932a2a155 SHA256 5108770f4b2d507a912a0ec5669dd6d23512afd0b70eadfcc10f7359513f9dbf
 EBUILD mc-4.7.5.2.ebuild 1950 RMD160 1ca9e3bda31808ca7ef6134f4dc0bd1f960dce16 SHA1 bf5bb81a103d5d26f3277020ac474ca278a02779 SHA256 43dead96569eba118d74d4eee7955c291c2e6e07bebed3de7cd146a2fa2a70f5
-EBUILD mc-4.7.5.5.ebuild 2037 RMD160 0118de937f9787474f988c79191743ba2d7d4fae SHA1 31d8d714368b48eda34eb2991b0d5140e8af6c8c SHA256 c8e739027220fe2e00c3d6fc87e833456c4bb2008c9315feb907ad4ac384a57c
 EBUILD mc-4.7.5.6-r1.ebuild 2045 RMD160 270e8616950482b443dc4d0d982353511084f871 SHA1 fbd907cfc5a57cc2fb1d9af779f35d369f0c3790 SHA256 93b5a58fb99313f7c395c5b049cf26bfd56a42aedac7bbcdbf0d5d0eddb8edcd
-EBUILD mc-4.8.0-r2.ebuild 2237 RMD160 1e97d628a8baaf5b621083efbe5915fe34c925fe SHA1 6f46c2c11fc45fcce4bbf5f1fa64605630491960 SHA256 ef3a0a94cec9dc495c14193f549e4041fd2b1160d9fab30fb77a9b21e7fd1306
 EBUILD mc-4.8.1-r1.ebuild 2219 RMD160 2c1c46f453962c6b230cf10a6d4f50491c0c0489 SHA1 30ccc75e0640cbd851f7aaea17e92d626961236d SHA256 7db0968758b2a3abcc8b863fdaa2569a5ec993adb2bceef4421d92044f8f2256
-EBUILD mc-9999.ebuild 2769 RMD160 103cde604fe51d3843e53f418bd02c3d4f28b9b6 SHA1 ab61c5cf2b43460f14e82ad6a29ad9be5b7288cc SHA256 b826aa48fd7157e0c5c250d2eb2c0a0c23372ce6bd39266700043e19c3da6335
-MISC ChangeLog 33975 RMD160 c76f1a49f34b51ed3161df6eae593c16eaf760a5 SHA1 275e1ef4991478231553bf485330bf7b975346cd SHA256 78e037409674e27ff985b1e9f6a7324a1d3af766450bf52a36ff9243430b6364
+EBUILD mc-4.8.1-r2.ebuild 2250 RMD160 d430d00732aa2dd0d97c1f13449b9739bdb6b338 SHA1 9d38021dbf9f69c5b884c1cceb41c5e51654cfe3 SHA256 671f48975b0281702700d4c1df1583132a2a20552d5378bcf468a23701d81df7
+EBUILD mc-9999.ebuild 2779 RMD160 cac18a6e08ad264302915c34c329c74f92a11e45 SHA1 fc1b7fdd51224ef07afe7986a210ac8f4f2db29d SHA256 9eb1bd4965fa615eb993daf2737717b28c9a319af5fded6468ab67cdf7bc1c0a
+MISC ChangeLog 34295 RMD160 f4c17a5c2778f561eeb101aae8995a60b533be35 SHA1 6af74a890513bc81a67959ea00f3bf5e20b15f3a SHA256 0998f21158c28553affe0f29644e1161dfa00db086ec5dfbf9d5eaf7b98b5ddd
 MISC metadata.xml 653 RMD160 5c0932709a9e11cef3ac4c95c88b906f688681c5 SHA1 bc2b471e4c49117bccb3dd2b1f9ec00cb24ca5da SHA256 760d390ffdbec152f1220dd02edc067a10243c4f936eed416b52d46a955dd683
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8gUWEACgkQcaHudmEf86rdfACaA+iMQnZLHvQAIkq1aAj5uBOe
-qOQAn3SX51QjhaIPQURQzpC475ijfLHl
-=D+H9
+iEYEARECAAYFAk8jCY4ACgkQcaHudmEf86o7uACfZfIkCq8qke1rGx/47/EQbcQD
+buoAn3NZ0QkIsEdhFlCQ2rKHjgZW/aYV
+=/Hrg
 -----END PGP SIGNATURE-----
diff --git a/app-misc/mc/files/mc-4.8.1-fix-fallocate-xBSD.patch b/app-misc/mc/files/mc-4.8.1-fix-fallocate-xBSD.patch
new file mode 100644
index 000000000000..85ce611945b3
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.1-fix-fallocate-xBSD.patch
@@ -0,0 +1,28 @@
+From a6ca3c289994a3a9ab8f481582e2632109b759f0 Mon Sep 17 00:00:00 2001
+From: Egmont Koblinger <egmont@gmail.com>
+Date: Thu, 19 Jan 2012 14:11:10 +0400
+Subject: [PATCH] Ticket #2689 (fix fallocate detection for xBSD)
+
+    fixed macros 'mc-get-fs-info.m4' for correct 'fallocate' detection under xBSD
+
+Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
+---
+ m4.include/mc-get-fs-info.m4 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/m4.include/mc-get-fs-info.m4 b/m4.include/mc-get-fs-info.m4
+index bc0ca54..b1474d8 100644
+--- a/m4.include/mc-get-fs-info.m4
++++ b/m4.include/mc-get-fs-info.m4
+@@ -5,7 +5,7 @@ dnl
+ 
+ AC_DEFUN([gl_POSIX_FALLOCATE], [
+     dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it.
+-    AC_TRY_COMPILE([
++    AC_TRY_LINK([
+         #define _XOPEN_SOURCE 600
+         #include <stdlib.h>
+         #if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 7)
+-- 
+1.7.8.3
+
diff --git a/app-misc/mc/mc-4.7.5.5.ebuild b/app-misc/mc/mc-4.7.5.5.ebuild
deleted file mode 100644
index 5f96139fab34..000000000000
--- a/app-misc/mc/mc-4.7.5.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.5.5.ebuild,v 1.2 2011/11/11 13:23:20 naota Exp $
-
-EAPI=4
-
-inherit base flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org"
-SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm +ncurses nls samba slang X"
-
-REQUIRED_USE="^^ ( ncurses slang )"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	ncurses? ( sys-libs/ncurses )
-	samba? ( net-fs/samba )
-	slang? ( >=sys-libs/slang-2 )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-vfs \
-		$(use_enable kernel_linux vfs-undelfs) \
-		--enable-charset \
-		$(use_with X x) \
-		$(use_enable samba vfs-smb) \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver ||
-			die "setting cons.saver's owner failed"
-		fperms g+s /usr/libexec/mc/cons.saver ||
-			die "setting cons.saver's permissions failed"
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.0-r2.ebuild b/app-misc/mc/mc-4.8.1-r2.ebuild
index c2206bc7629f..527d0b10a6f4 100644
--- a/app-misc/mc/mc-4.8.0-r2.ebuild
+++ b/app-misc/mc/mc-4.8.1-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.0-r2.ebuild,v 1.1 2011/11/30 07:21:30 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.1-r2.ebuild,v 1.1 2012/01/27 20:26:43 slyfox Exp $
 
 EAPI=4
 
-inherit base flag-o-matic
+inherit autotools eutils flag-o-matic
 
 MY_P=${P/_/-}
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib +ncurses nls samba slang test X"
+IUSE="+edit gpm mclib +ncurses nls samba slang test X +xdg"
 
 REQUIRED_USE="^^ ( ncurses slang )"
 
@@ -39,15 +39,21 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES=("${FILESDIR}/${PN}"-4.8.0-fix-nls.patch
-	"${FILESDIR}/${PN}"-4.8.0-fix-ftp-spaces.patch
-	)
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.8.1-fix-fallocate-xBSD.patch
+
+	# patch above changed .m4 bits
+	eautoreconf
+}
 
 src_configure() {
 	local myscreen=ncurses
 	use slang && myscreen=slang
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
 
+	local homedir=".mc"
+	use xdg && homedir="XDG"
+
 	econf \
 		--disable-dependency-tracking \
 		$(use_enable nls) \
@@ -60,19 +66,18 @@ src_configure() {
 		--with-screen=${myscreen} \
 		$(use_with edit) \
 		$(use_enable mclib) \
-		$(use_enable test tests)
+		$(use_enable test tests) \
+		--with-homedir=${homedir}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS README NEWS
 
 	# fix bug #334383
 	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver ||
-			die "setting cons.saver's owner failed"
-		fperms g+s /usr/libexec/mc/cons.saver ||
-			die "setting cons.saver's permissions failed"
+		fowners root:tty /usr/libexec/mc/cons.saver
+		fperms g+s /usr/libexec/mc/cons.saver
 	fi
 }
 
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index 9784dfe24223..2e5718a223dd 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-9999.ebuild,v 1.2 2012/01/25 18:56:16 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-9999.ebuild,v 1.3 2012/01/27 20:26:43 slyfox Exp $
 
 EAPI=4
 
@@ -12,11 +12,10 @@ fi
 
 inherit eutils flag-o-matic ${LIVE_ECLASSES}
 
-if [[ -n ${LIVE_EBUILD} ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://www.midnight-commander.org/downloads/${P}.tar.xz"
+MY_P=${P/_/-}
+
+if [[ -z ${LIVE_EBUILD} ]]; then
+	SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 fi
 
@@ -64,6 +63,8 @@ src_prepare() {
 	strip-linguas ${LANGS}
 }
 
+S=${WORKDIR}/${MY_P}
+
 src_configure() {
 	local myscreen=ncurses
 	use slang && myscreen=slang