Fixed parallel make issue, bug #353390.

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

4 files changed, 158 insertions, 2 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/Manifest b/www-client/w3m/Manifest
index 1820fe028f91..dc13409a12fc 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -1,11 +1,33 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX w3m-0.5.2-ambwidth.patch 13634 RMD160 21d967a5b6816e55aac12a161e575121065a336f SHA1 a9a040d2e9b17ed5ca454a0133e525a0ec542ba2 SHA256 9cad290d4c0122964ecb674e636fb7551b400b4f32a2697ca15d68e2fe8cf4ce
 AUX w3m-0.5.2-form.patch 309 RMD160 8f208c562fdce59ef97009e373925a33815a3dcd SHA1 e703286d1a67e67b2b052ef9806e202a5ef434ec SHA256 a0e6084c82db55c746cd00410c8781887fd52b61eca86a8a61269570622c41bf
 AUX w3m-0.5.2-gc72.patch 769 RMD160 475b22c156c6be49729e9a563d5d5493ba249c4d SHA1 d0332b8dcdf3fac1f91485d6858ad8c8b25ada69 SHA256 6a6a736db1edc3936a604d7b63512510158b4decfbdadaff85f7bf14d6377a86
+AUX w3m-0.5.3-parallel-make.patch 351 RMD160 d253ca9e1e47e67c31ad1320573d034447022d42 SHA1 11fb11ba105cfbbf695eb9fa299a7ea0ea84c01c SHA256 606ecdf4b41a49f71efd76a24e6f69fb9aa2ef69d0d27f2e1a7ad42e3a1e47db
 AUX w3m-CVE-2010-2074.patch 1597 RMD160 2a0f198a18ddec42ac070a9433d39177a41860f1 SHA1 e7e9502af2e749fff7e173c5eb6e27158591f5b8 SHA256 3ceb88f635f2b26509acf99c4817d746f4bd50f2cb6ff3152e919fdfb234d0e2
 AUX w3m.mailcap 44 RMD160 86f571fda5a25bc7ffe2a2094c2bc590c0395ce0 SHA1 dccd475e42a34e132adfc2aa13c3c789cd2e6fff SHA256 5f3c243df65c4d2e5ceeb1fae285e0f9f6660c7b0fc66bb7e46803c1de1890b5
 DIST w3m-0.5.2.tar.gz 1906812 RMD160 09ce72d8ef5e621a2e49496b63e22f2773edbe79 SHA1 484522547ae6dbb342d3858a2a53a65451e273f9 SHA256 5ff3e5a1f50a4a8e6ddbfdeefbe13d3a7f63538595a8e29f5da504ea46eda646
 DIST w3m-0.5.3.tar.gz 2202328 RMD160 6a0153bc53f7c107c700404262ce1b4d02e6dd91 SHA1 444b6c8cf7094ee95f8e9de96b37f814b9d83237 SHA256 e994d263f2fd2c22febfbe45103526e00145a7674a0fda79c822b97c2770a9e3
 EBUILD w3m-0.5.2-r4.ebuild 3357 RMD160 5778fb23367cb9fdbc87c4e8fe4c9b6be802ac7b SHA1 19741e7283ec901b7d5b3a8925d47474f738401e SHA256 bda789aecac94532327680fb52a09e65651cf08743900a05a0b7c1afdd37d7e1
+EBUILD w3m-0.5.3-r1.ebuild 3290 RMD160 5d4166a55375d256b294335c61d60faff91da4a7 SHA1 807cca349b6b3c931d5bb60a4f3720c7aad9ab1a SHA256 ef6a21727531eb764537974998f9ac061fd2ed29eb403a8ac8f0814cf09533c8
 EBUILD w3m-0.5.3.ebuild 3235 RMD160 487900b8d7f05c72889d8372c24b87415251ebf0 SHA1 8a9e8470a30d345d24943ccbe55e54cbdb41a438 SHA256 fff5e4f615ae78296b84787860f3fb5c6872c378dd0eca5ded0a53739a710ebe
-MISC ChangeLog 18858 RMD160 914ae6c9c7699bf9e8167c7ff13795637fd6cd4b SHA1 68d268dc7e67cdb4c3cd1d749688090a565db74f SHA256 0e8f8d180b0961da2ea11aeb2f2e82a1b68cb304e3ddebca06e4e76e27c5ffde
+MISC ChangeLog 19039 RMD160 c9d5d6d7a0e2af721798a4a6115a74b782b66fd3 SHA1 9d5604828285c00d662fa8038794297fe54454d2 SHA256 190ce7d3906f413c4a87e71c2ff3fcdb8f78839d8796720a6409665821f32846
 MISC metadata.xml 237 RMD160 795d70d06b61c12bd15a97e596afed87747e7553 SHA1 a1a1f21305275c396fb2784bb261595fbf510a6f SHA256 58936b557c67f7e90052564817055decab28947a9934d0b889fa5d7e2901ba6d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNSYVeAAoJECaGw+YFKA1pACAP/iAQU8tsDqXPmY2VAISAJOAh
+gv4OE184Fai9+srn9rgwmlhgWQKVZ+ndp+MLcUckl1jkTT93viJGdC/JFwI2V9TV
+DaoUdZIp0ITiEHE924XVy2C4wkQhg2LOs2mrQA69zdcsOto/PyYUxVfbJG2AYcMG
+46bmQO9SXRdToswrx7xVWY2lqeD3OObP2o2k/mYkaDlTnL3OvwwF3fnpElvwht9n
+FaB3v3AqXdT6mYaAtX0hO1FslbRob6YjhnK3OE3zD9y70XITKyJ+h1qvylN94UX7
+fRQMgox0fB8GOKPRQWlcLIFG/K4cCFrUTsF6lt2m2HxY/fvog07ZKkPTFJVNV8SZ
+eUxny+qqgyGgINW/+amcfhEBjvs4VSOKrht869e8Kufhaq5jcqTiN1XHfRXtR/yb
+yyG2Yma70kHGkJASLPCc6kIV9kRuWYG+AkJCmsgxt57vw/k+8fUOzRJ5qhu5U7Qe
+N9zgp5qC7iLLMLYbpXuL1b88e6LWS9NVZHRVMenAZNrSfxmvqEtUT1cm02eKGalQ
+QpEIvvyTvGLdhGBDmd2TnOafpwlHkbn5vwbYDhid9w3ayC9btdsDqByH4XfXKEJt
+CHnNxyc22MehumRqzYbrgG9mE0eTj6k++lgOJx/Fxt3z/h3y0ToaZ7tegCwVddV+
+yWcchELWL3nUJuvJ+/rI
+=EKxr
+-----END PGP SIGNATURE-----
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
+}