Added -j1, bug #215394.

(Portage version: 2.1.4.4)

5 files changed, 10 insertions, 168 deletions

diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index 8c0117204f89..0a46639ea697 100644
--- a/www-client/w3m/ChangeLog
+++ b/www-client/w3m/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/w3m
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.43 2008/03/07 13:32:34 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.44 2008/04/03 16:17:42 matsuu Exp $
+
+  03 Apr 2008; MATSUU Takuto <matsuu@gentoo.org>
+  -files/w3m-0.5.1-security.patch, -files/w3m-w3mman-gentoo.diff,
+  -w3m-0.5.1-r4.ebuild, w3m-0.5.2-r1.ebuild:
+  Added -j1, bug #215394.
+  Removed old version.
 
   07 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> w3m-0.5.2-r1.ebuild:
   amd64 stable
diff --git a/www-client/w3m/files/w3m-0.5.1-security.patch b/www-client/w3m/files/w3m-0.5.1-security.patch
deleted file mode 100644
index 2a05dd086c04..000000000000
--- a/www-client/w3m/files/w3m-0.5.1-security.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur w3m-0.5.1.orig/file.c w3m-0.5.1/file.c
---- w3m-0.5.1.orig/file.c	2004-04-17 03:47:19.000000000 +0900
-+++ w3m-0.5.1/file.c	2006-12-28 00:40:00.000000000 +0900
-@@ -7799,7 +7799,7 @@
- 	ans = inputChar(prompt);
-     }
-     else {
--	printf(prompt);
-+	printf("%s", prompt);
- 	fflush(stdout);
- 	ans = Strfgets(stdin)->ptr;
-     }
diff --git a/www-client/w3m/files/w3m-w3mman-gentoo.diff b/www-client/w3m/files/w3m-w3mman-gentoo.diff
deleted file mode 100644
index be0f16e560fa..000000000000
--- a/www-client/w3m/files/w3m-w3mman-gentoo.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN w3m-0.4.2.ORIG/scripts/w3mman/w3mman.in w3m-0.4.2/scripts/w3mman/w3mman.in
---- w3m-0.4.2.ORIG/scripts/w3mman/w3mman.in	2003-09-25 00:58:27.000000000 +0900
-+++ w3m-0.4.2/scripts/w3mman/w3mman.in	2003-09-25 03:12:38.000000000 +0900
-@@ -1,7 +1,7 @@
- #!@PERL@
- 
- @W3M = split(' ', $ENV{'W3MMAN_W3M'} || '@W3M@');
--$ENV{'W3MMAN_MAN'} ||= '@MAN@';
-+$ENV{'W3MMAN_MAN'} ||= 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@';
- $SCRIPT = 'file:///$LIB/w3mman2html.cgi';
- 
- sub usage {
-diff -urN w3m-0.4.2.ORIG/scripts/w3mman/w3mman2html.cgi.in w3m-0.4.2/scripts/w3mman/w3mman2html.cgi.in
---- w3m-0.4.2.ORIG/scripts/w3mman/w3mman2html.cgi.in	2003-09-25 00:58:27.000000000 +0900
-+++ w3m-0.4.2/scripts/w3mman/w3mman2html.cgi.in	2003-09-25 03:12:38.000000000 +0900
-@@ -1,6 +1,6 @@
- #!@PERL@
- 
--$MAN = $ENV{'W3MMAN_MAN'} || '@MAN@';
-+$MAN = $ENV{'W3MMAN_MAN'} || 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@';
- $QUERY = $ENV{'QUERY_STRING'} || $ARGV[0];
- $SCRIPT_NAME = $ENV{'SCRIPT_NAME'} || $0;
- $CGI = "file://$SCRIPT_NAME";
diff --git a/www-client/w3m/w3m-0.5.1-r4.ebuild b/www-client/w3m/w3m-0.5.1-r4.ebuild
deleted file mode 100644
index 6e2cda7e6d87..000000000000
--- a/www-client/w3m/w3m-0.5.1-r4.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.1-r4.ebuild,v 1.10 2007/07/22 06:11:10 dberkholz Exp $
-
-inherit eutils
-
-DESCRIPTION="Text based WWW browser, supports tables and frames"
-HOMEPAGE="http://w3m.sourceforge.net/
-	http://www.page.sannet.ne.jp/knabe/w3m/w3m.html"
-PATCH_PATH="http://www.page.sannet.ne.jp/knabe/w3m/"
-SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz
-	async? ( ${PATCH_PATH}/w3m-cvs-1.942-async-7.diff.gz )
-	http://dev.gentoo.org/~usata/distfiles/${P}-cvs1.938.diff.gz"
-# w3m color patch:
-#	http://homepage3.nifty.com/slokar/w3m/${P}_256-005.patch.gz
-# w3n canna inline patch:
-#	canna? ( http://www.j10n.org/files/w3m-cvs-1.914-canna.patch )
-# w3m bookmark charset patch:
-#	nls? ( ${PATCH_PATH}/w3m-cvs-1.942-nls-2.diff.gz )
-
-LICENSE="w3m"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="X async fbcon gpm gtk imlib lynxkeymap migemo nls ssl unicode xface"
-#IUSE="canna"
-
-# canna? ( app-i18n/canna )
-# 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/libX11 )
-	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 )"
-PROVIDE="virtual/w3m"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	epatch ${DISTDIR}/${P}-cvs1.938.diff.gz
-	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
-	epatch ${FILESDIR}/${P}-security.patch
-
-	use async && epatch ${DISTDIR}/w3m-cvs-1.942-async-7.diff.gz
-
-	#epatch ${DISTDIR}/${P}_256-005.patch.gz
-	#use canna && epatch ${DISTDIR}/w3m-cvs-1.914-canna.patch
-}
-
-src_compile() {
-
-	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 /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
-		myconf="${myconf} --enable-japanese=E"
-	else
-		myconf="${myconf} --with-charset=US-ASCII"
-	fi
-	if use unicode ; then
-		myconf="${myconf} --with-charset=UTF-8"
-	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=/usr/bin/nano \
-		--with-mailer=/bin/mail \
-		--with-browser=/usr/bin/mozilla \
-		--with-termlib=curses \
-		--enable-image=${imageval:-no} \
-		--with-imagelib="${imagelibval:-no}" \
-		--with-migemo="${migemo_command}" \
-		--enable-m17n \
-		--enable-unicode \
-		$(use_enable gpm mouse) \
-		$(use_enable ssl digest-auth) \
-		$(use_with ssl) \
-		$(use_enable nls) \
-		$(use_enable xface) \
-		${myconf} || die
-		# $(use_with canna)
-
-	# emake borked
-	emake -j1 all || die "make failed"
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	insinto /usr/share/${PN}/Bonus
-	doins Bonus/*
-	dodoc README NEWS TODO ChangeLog
-	docinto doc-en ; dodoc doc/*
-	if use linguas_ja ; then
-		docinto doc-jp ; dodoc doc-jp/*
-	else
-		rm -rf ${D}/usr/share/man/ja
-	fi
-}
diff --git a/www-client/w3m/w3m-0.5.2-r1.ebuild b/www-client/w3m/w3m-0.5.2-r1.ebuild
index c87f749ca2ff..bb528199959e 100644
--- a/www-client/w3m/w3m-0.5.2-r1.ebuild
+++ b/www-client/w3m/w3m-0.5.2-r1.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/www-client/w3m/w3m-0.5.2-r1.ebuild,v 1.4 2008/03/07 13:32:34 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.2-r1.ebuild,v 1.5 2008/04/03 16:17:42 matsuu Exp $
 
 inherit eutils
 
@@ -94,7 +94,8 @@ src_compile() {
 		$(use_enable xface) \
 		${myconf} || die
 
-	emake || die "emake failed"
+	# parallel make borks, bug #215394.
+	emake -j1 || die "emake failed"
 }
 
 src_install() {