Fixed parallel make issue, bug #353390.

(Portage version: 2.1.9.35/cvs/Linux x86_64)

3 files changed, 135 insertions, 1 deletions

diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index 991ffe2c68da..dc3434e178c7 100644
--- a/www-client/w3m/ChangeLog
+++ b/www-client/w3m/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/w3m
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.62 2011/01/26 16:08:54 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.63 2011/02/02 16:24:38 matsuu Exp $
+
+*w3m-0.5.3-r1 (02 Feb 2011)
+
+  02 Feb 2011; MATSUU Takuto <matsuu@gentoo.org> +w3m-0.5.3-r1.ebuild,
+  +files/w3m-0.5.3-parallel-make.patch:
+  Fixed parallel make issue, bug #353390.
 
   26 Jan 2011; Jeremy Olexa <darkside@gentoo.org> w3m-0.5.3.ebuild:
   Add prefix keywords, as tested in prefix overlay
diff --git a/www-client/w3m/files/w3m-0.5.3-parallel-make.patch b/www-client/w3m/files/w3m-0.5.3-parallel-make.patch
new file mode 100644
index 000000000000..8d89b9309575
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.3-parallel-make.patch
@@ -0,0 +1,12 @@
+diff -Naur w3m-0.5.3.orig/w3mimg/Makefile.in w3m-0.5.3/w3mimg/Makefile.in
+--- w3m-0.5.3.orig/w3mimg/Makefile.in	2011-01-04 18:22:28.000000000 +0900
++++ w3m-0.5.3/w3mimg/Makefile.in	2011-02-02 11:35:47.725076601 +0900
+@@ -22,6 +22,8 @@
+ 	$(AR) rv $@ $(IMGOBJS)
+ 	$(RANLIB) $@
+ 
++$(IMGOBJS): @IMGTARGETS@
++
+ w3mimg.o: w3mimg.c
+ 	$(CC) $(CFLAGS) -c $<
+ 
diff --git a/www-client/w3m/w3m-0.5.3-r1.ebuild b/www-client/w3m/w3m-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..9a930dea01cb
--- /dev/null
+++ b/www-client/w3m/w3m-0.5.3-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.3-r1.ebuild,v 1.1 2011/02/02 16:24:38 matsuu Exp $
+
+EAPI="3"
+inherit eutils
+
+DESCRIPTION="Text based WWW browser, supports tables and frames"
+HOMEPAGE="http://w3m.sourceforge.net/"
+SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz"
+
+LICENSE="w3m"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="X fbcon gpm gtk imlib lynxkeymap migemo nls nntp ssl unicode xface linguas_ja"
+
+# We cannot build w3m with gtk+2 w/o X because gtk+2 ebuild doesn't
+# allow us to build w/o X, so we have to give up framebuffer w3mimg....
+DEPEND=">=sys-libs/ncurses-5.2-r3
+	>=sys-libs/zlib-1.1.3-r2
+	>=dev-libs/boehm-gc-6.2
+	X? ( x11-libs/libXext x11-libs/libXdmcp )
+	gtk? ( >=x11-libs/gtk+-2 )
+	!gtk? ( imlib? ( >=media-libs/imlib2-1.1.0 ) )
+	xface? ( media-libs/compface )
+	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
+	migemo? ( >=app-text/migemo-0.40 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )"
+RDEPEND="${DEPEND}"
+PROVIDE="virtual/w3m"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-0.5.2-gc72.patch" \
+		"${FILESDIR}/${PN}-0.5.3-parallel-make.patch"
+}
+
+src_configure() {
+	local myconf migemo_command imagelibval imageval
+
+	if use gtk ; then
+		imagelibval="gtk2"
+	elif use imlib ; then
+		imagelibval="imlib2"
+	fi
+
+	if [ ! -z "${imagelibval}" ] ; then
+		use X && imageval="${imageval}${imageval:+,}x11"
+		use X && use fbcon && imageval="${imageval}${imageval:+,}fb"
+	fi
+
+	if use migemo ; then
+		migemo_command="migemo -t egrep ${EPREFIX}/usr/share/migemo/migemo-dict"
+	else
+		migemo_command="no"
+	fi
+
+	# emacs-w3m doesn't like "--enable-m17n --disable-unicode,"
+	# so we better enable or disable both. Default to enable
+	# m17n and unicode, see bug #47046.
+	if use linguas_ja ; then
+		if use unicode ; then
+			myconf="${myconf} --enable-japanese=U"
+		else
+			myconf="${myconf} --enable-japanese=E"
+		fi
+	elif use unicode ; then
+		myconf="${myconf} --with-charset=UTF-8"
+	else
+		myconf="${myconf} --with-charset=US-ASCII"
+	fi
+
+	# lynxkeymap IUSE flag. bug #49397
+	if use lynxkeymap ; then
+		myconf="${myconf} --enable-keymap=lynx"
+	else
+		myconf="${myconf} --enable-keymap=w3m"
+	fi
+
+	econf \
+		--with-editor="${EPREFIX}/usr/bin/vi" \
+		--with-mailer="${EPREFIX}/bin/mail" \
+		--with-browser="${EPREFIX}/usr/bin/xdg-open" \
+		--with-termlib=ncurses \
+		--enable-image=${imageval:-no} \
+		--with-imagelib="${imagelibval:-no}" \
+		--with-migemo="${migemo_command}" \
+		--enable-m17n \
+		--enable-unicode \
+		$(use_enable gpm mouse) \
+		$(use_enable nls) \
+		$(use_enable nntp) \
+		$(use_enable ssl digest-auth) \
+		$(use_with ssl) \
+		$(use_enable xface) \
+		${myconf} || die
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200307.month/3944.html
+	insinto /etc/${PN}
+	newins "${FILESDIR}/${PN}.mailcap" mailcap || die
+
+	insinto /usr/share/${PN}/Bonus
+	doins Bonus/* || die
+	dodoc README NEWS TODO ChangeLog || die
+	docinto doc-en ; dodoc doc/* || die
+	if use linguas_ja ; then
+		docinto doc-jp ; dodoc doc-jp/* || die
+	else
+		rm -rf "${ED}"/usr/share/man/ja || die
+	fi
+}