Version bumped, bug #336497.

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

6 files changed, 56 insertions, 374 deletions

diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index fc29d0f2034d..7ca1061b31a0 100644
--- a/www-client/w3m/ChangeLog
+++ b/www-client/w3m/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for www-client/w3m
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.60 2010/09/27 11:05:23 xmw Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.61 2011/01/15 16:57:07 matsuu Exp $
+
+  15 Jan 2011; MATSUU Takuto <matsuu@gentoo.org> -w3m-0.5.2.ebuild,
+  -w3m-0.5.2-r1.ebuild, -w3m-0.5.2-r2.ebuild, -w3m-0.5.2-r3.ebuild,
+  +w3m-0.5.3.ebuild:
+  Version bumped, bug #336497. Removed old versions.
+
+*w3m-0.5.3 (15 Jan 2011)
+
+  15 Jan 2011; MATSUU Takuto <matsuu@gentoo.org> -w3m-0.5.2.ebuild,
+  -w3m-0.5.2-r1.ebuild, -w3m-0.5.2-r2.ebuild, -w3m-0.5.2-r3.ebuild,
+  +w3m-0.5.3.ebuild:
+  Version bumped. Removed old versions.
 
   26 Sep 2010; Michael Weber <xmw@gentoo.org> w3m-0.5.2-r4.ebuild:
   Added ~arm keyword
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index f355470d4abd..09f3cb3ae0b1 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -1,13 +1,31 @@
+-----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-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
-EBUILD w3m-0.5.2-r1.ebuild 2970 RMD160 110c3f866b5595e9f07204b9ee59d93a4a0b3113 SHA1 8c3f3b0dfa6f4eeef0a33e523c34c168e08d0725 SHA256 a367f6f136713dc8664a4f6ec52e7a71d2e1d3855e207fc9d5267ed32245681e
-EBUILD w3m-0.5.2-r2.ebuild 3223 RMD160 74b0270a79c18633b95d62958bd3402caede0c47 SHA1 f3041b274768123f502e4b3f36e045d77781e2db SHA256 d153c1d3a9d1cbc393bbf3b00208aec16ba5127db1ca7b1c93ea936193e17dc8
-EBUILD w3m-0.5.2-r3.ebuild 3267 RMD160 07a9acb427d26a68107b0eb6ec555f6ca9094f7e SHA1 cb1493d14eb664cd67266021d169d42b7fccb9f6 SHA256 597a5834ec3db70a308140cfd5e5da70767a5cb84b9e45ee865205155418ed4a
+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.2.ebuild 2843 RMD160 80b57f81897b6ee8b6d0d729ec19777da31da5fc SHA1 9b622cf526742f10c3f6f083d1f6ac99bef70695 SHA256 2d03f839d7e08b12e24c75fa3383443bdbc9ccb4b30382fe197af6abffed6843
-MISC ChangeLog 18496 RMD160 68b4a91d050b98dfb3929e4fce68e17cdc9988e2 SHA1 40e563a3709db3aa826572c6847533d7aafc83ff SHA256 853e3025e5fa93b6fff78b0c8c6efbf8d1a5741e222f32a9f4efe5aeb0912901
+EBUILD w3m-0.5.3.ebuild 3148 RMD160 f8c8bc74548152a86b742b5152c02a3ff501a2b0 SHA1 2ec24f00f900f833c265f7aec925da36c2c84c32 SHA256 45b9c4e7243671d24d0f54b9d57a21481005def393d4229f9ee9ec924dfdaccd
+MISC ChangeLog 18934 RMD160 f757a395eeec6bc157a9de5470570ac8e98e0912 SHA1 f0be6ca6372f6efb7603c8241397d59c08c10a39 SHA256 3a47cc2f1cec75b226f7446c61637b404c259dc0577b3e6644d8c577424554d3
 MISC metadata.xml 237 RMD160 795d70d06b61c12bd15a97e596afed87747e7553 SHA1 a1a1f21305275c396fb2784bb261595fbf510a6f SHA256 58936b557c67f7e90052564817055decab28947a9934d0b889fa5d7e2901ba6d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNMdHzAAoJECaGw+YFKA1paMUQAImuklOV8cyi2BrMS7pPGTpv
+nRFpBFCrpdIAFGInDatsk/X+0uLKPg0j/oZS+yU8BpfJgptRnv1FXwy8A/WkX/EF
+oWUNidn29z0piCFYfP1HYJhuz860McY57RfqoSqzf/iQY32TaKSDucekXyyo7+vE
+N6YaGyRpJU1vmLaJy58KswsgDVaad2U2ChPIYOFJGq6ghFtpMgO2wCpBHZCB+llK
+qk8hzZX/8cnfGR/dkPWG1L+rKltThw08c1Eivlfdy/8YvC4mOvbcploVRWnhETEW
+74HVCCEdA7Wb20N0VeLi/ZdeiSQTgrVytzFfPBp3O4FCV54sUwcOHkp3RbCb7VlF
+gtN9hWMSnDISpFsWJjfnauiMk+y/mb433C52Wc32fiEffwCUCtkGNcS9eAcqAX6l
+cu8cTTswRHi2/SL24wMRr8Zow6Ghalv4L/ftIE+1nx5WdKCuSXZiIQXbSaXeZzaT
+31laWLZ3PyYivzPTwZ0jM20VUEcIef2SXacv1rOdKDDkWyYCjgenidqz5KKzVCsk
+riKuTGQx8v007O4Mz7Lx4PIdNa8jUkf0L2ZjzhEz6RPIbmmnQ4pbKAi2CD2IPShO
+/2H742egeixUlpLzqyET/cbhht0MtMxIejZzrkK818G8WESt0O9BFAYyoxlxLekk
+VUnWbUUNpwvUYa78zOaS
+=jK9x
+-----END PGP SIGNATURE-----
diff --git a/www-client/w3m/w3m-0.5.2-r1.ebuild b/www-client/w3m/w3m-0.5.2-r1.ebuild
deleted file mode 100644
index bb528199959e..000000000000
--- a/www-client/w3m/w3m-0.5.2-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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.5 2008/04/03 16:17:42 matsuu Exp $
-
-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 ia64 ~ppc ppc64 sparc x86"
-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 )"
-PROVIDE="virtual/w3m"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-ambwidth.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
-		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=/usr/bin/vi \
-		--with-mailer=/bin/mail \
-		--with-browser=/usr/bin/firefox \
-		--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 nls) \
-		$(use_enable nntp) \
-		$(use_enable ssl digest-auth) \
-		$(use_with ssl) \
-		$(use_enable xface) \
-		${myconf} || die
-
-	# parallel make borks, bug #215394.
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die "emake 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-r3.ebuild b/www-client/w3m/w3m-0.5.2-r3.ebuild
deleted file mode 100644
index 6edfe5bbd780..000000000000
--- a/www-client/w3m/w3m-0.5.2-r3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2009 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-r3.ebuild,v 1.1 2009/12/13 23:25:21 matsuu Exp $
-
-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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-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 )"
-PROVIDE="virtual/w3m"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-ambwidth.patch"
-	# http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200708.month/4286.html
-	epatch "${FILESDIR}/${P}-form.patch"
-	epatch "${FILESDIR}/${P}-gc72.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
-		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=/usr/bin/vi \
-		--with-mailer=/bin/mail \
-		--with-browser=/usr/bin/firefox \
-		--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 nls) \
-		$(use_enable nntp) \
-		$(use_enable ssl digest-auth) \
-		$(use_with ssl) \
-		$(use_enable xface) \
-		${myconf} || die
-
-	# parallel make borks, bug #215394.
-	emake -j1 || die "emake failed"
-}
-
-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
-
-	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.ebuild b/www-client/w3m/w3m-0.5.2.ebuild
deleted file mode 100644
index 7340a88057ef..000000000000
--- a/www-client/w3m/w3m-0.5.2.ebuild
+++ /dev/null
@@ -1,107 +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.2.ebuild,v 1.6 2007/10/15 15:10:51 corsair Exp $
-
-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 ia64 ppc ppc64 sparc x86"
-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 )"
-PROVIDE="virtual/w3m"
-
-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
-		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=/usr/bin/vi \
-		--with-mailer=/bin/mail \
-		--with-browser=/usr/bin/firefox \
-		--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 nls) \
-		$(use_enable nntp) \
-		$(use_enable ssl digest-auth) \
-		$(use_with ssl) \
-		$(use_enable xface) \
-		${myconf} || die
-
-	emake || die "emake failed"
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die "emake 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-r2.ebuild b/www-client/w3m/w3m-0.5.3.ebuild
index c3169713a6ca..b63a82543ac8 100644
--- a/www-client/w3m/w3m-0.5.2-r2.ebuild
+++ b/www-client/w3m/w3m-0.5.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.2-r2.ebuild,v 1.6 2010/01/16 20:38:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.3.ebuild,v 1.1 2011/01/15 16:57:07 matsuu Exp $
 
+EAPI="3"
 inherit eutils
 
 DESCRIPTION="Text based WWW browser, supports tables and frames"
@@ -10,7 +11,7 @@ SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz"
 
 LICENSE="w3m"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 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
@@ -25,18 +26,14 @@ DEPEND=">=sys-libs/ncurses-5.2-r3
 	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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-ambwidth.patch"
-	# http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200708.month/4286.html
-	epatch "${FILESDIR}/${P}-form.patch"
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.5.2-gc72.patch"
 }
 
-src_compile() {
-
+src_configure() {
 	local myconf migemo_command imagelibval imageval
 
 	if use gtk ; then
@@ -51,7 +48,7 @@ src_compile() {
 	fi
 
 	if use migemo ; then
-		migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
+		migemo_command="migemo -t egrep ${EPREFIX}/usr/share/migemo/migemo-dict"
 	else
 		migemo_command="no"
 	fi
@@ -79,10 +76,10 @@ src_compile() {
 	fi
 
 	econf \
-		--with-editor=/usr/bin/vi \
-		--with-mailer=/bin/mail \
-		--with-browser=/usr/bin/firefox \
-		--with-termlib=curses \
+		--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}" \
@@ -95,9 +92,6 @@ src_compile() {
 		$(use_with ssl) \
 		$(use_enable xface) \
 		${myconf} || die
-
-	# parallel make borks, bug #215394.
-	emake -j1 || die "emake failed"
 }
 
 src_install() {
@@ -106,15 +100,15 @@ src_install() {
 
 	# http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200307.month/3944.html
 	insinto /etc/${PN}
-	newins "${FILESDIR}/${PN}.mailcap" mailcap
+	newins "${FILESDIR}/${PN}.mailcap" mailcap || die
 
 	insinto /usr/share/${PN}/Bonus
-	doins Bonus/*
-	dodoc README NEWS TODO ChangeLog
-	docinto doc-en ; dodoc doc/*
+	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/*
+		docinto doc-jp ; dodoc doc-jp/* || die
 	else
-		rm -rf "${D}"/usr/share/man/ja
+		rm -rf "${ED}"/usr/share/man/ja || die
 	fi
 }