- work around mc cross compile problems by skipping the building of docs

(Portage version: 2.1.4.4)

3 files changed, 21 insertions, 5 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 8c3fe89dad24..21ebea494960 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-misc/mc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.142 2008/07/31 16:42:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.143 2008/09/14 02:04:27 solar Exp $
+
+  14 Sep 2008; <solar@gentoo.org> mc-4.6.1-r4.ebuild, mc-4.6.2_pre1.ebuild:
+  - work around mc cross compile problems by skipping the building of docs
 
   31 Jul 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/app-misc/mc/mc-4.6.1-r4.ebuild b/app-misc/mc/mc-4.6.1-r4.ebuild
index 00b96436caa8..4aad230afa7a 100644
--- a/app-misc/mc/mc-4.6.1-r4.ebuild
+++ b/app-misc/mc/mc-4.6.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r4.ebuild,v 1.14 2008/04/27 08:57:39 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.1-r4.ebuild,v 1.15 2008/09/14 02:04:27 solar Exp $
 
 inherit flag-o-matic eutils
 
@@ -71,6 +71,12 @@ src_unpack() {
 	sed -i -e "s:^\(cons_saver_LDADD = .*\):\1 -Wl,-z,now:" \
 		src/Makefile.in
 
+	# docs try to run the files it just built while trying convert .1 to .hlp files.
+	# this will never work for cross compiles, so we simply don't make docs.
+	if tc-is-cross-compiler; then
+		sed -i -e s/'lib doc syntax'/'lib syntax'/ Makefile.in
+	fi
+
 	# Correctly generate charset.alias.
 	# Fixes bugs  71275, 105960 and 169678
 	epatch "${FILESDIR}"/${P}-charset-locale-aliases.patch
diff --git a/app-misc/mc/mc-4.6.2_pre1.ebuild b/app-misc/mc/mc-4.6.2_pre1.ebuild
index 1c1eaf9cd536..a5ee4bc5a7a8 100644
--- a/app-misc/mc/mc-4.6.2_pre1.ebuild
+++ b/app-misc/mc/mc-4.6.2_pre1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.2_pre1.ebuild,v 1.4 2008/05/05 17:12:22 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.2_pre1.ebuild,v 1.5 2008/09/14 02:04:27 solar Exp $
 
 EAPI=1
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 MY_P=${P/_/-}
 
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.gnu.org/gnu/mc/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~arm ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="gpm nls samba +unicode X"
 
 RDEPEND=">=dev-libs/glib-2
@@ -49,6 +49,12 @@ src_unpack() {
 	# Prevent lazy bindings in cons.saver binary for bug #135009
 	sed -i -e "s:^\(cons_saver_LDADD = .*\):\1 -Wl,-z,now:" \
 		src/Makefile.in || die "sed failed."
+
+	# docs try to run the files it just built while trying convert .1 to .hlp files.
+	# this will never work for cross compiles, so we simply don't make docs.
+	if tc-is-cross-compiler; then
+		sed -i -e s/'lib doc syntax'/'lib syntax'/ Makefile.in
+	fi
 }
 
 src_compile() {
@@ -86,3 +92,4 @@ src_install() {
 	insinto /usr/share/mc/syntax
 	doins "${FILESDIR}"/ebuild.syntax
 }
+