application/xhtml+xml support.

Fixed history back issue.
Package-Manager: portage-2.1.5_rc6

5 files changed, 143 insertions, 2 deletions

diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index 0a46639ea697..1c887ee811be 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.44 2008/04/03 16:17:42 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.45 2008/05/15 23:53:33 matsuu Exp $
+
+*w3m-0.5.2-r2 (15 May 2008)
+
+  15 May 2008; MATSUU Takuto <matsuu@gentoo.org> +files/w3m.mailcap,
+  +files/w3m-0.5.2-form.patch, +w3m-0.5.2-r2.ebuild:
+  application/xhtml+xml support. Fixed history back issue.
 
   03 Apr 2008; MATSUU Takuto <matsuu@gentoo.org>
   -files/w3m-0.5.1-security.patch, -files/w3m-w3mman-gentoo.diff,
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index 1b9e402e10fc..421608ffd872 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -1,6 +1,9 @@
 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.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 3229 RMD160 7c4ad315b425d305b9bd91b7f202a21cba09026f SHA1 cc460039fa37c8793ae9d41322e7cf3bdc413ea5 SHA256 0713eb9b6bdc2037a7a140145884a5125a9361ba8d53d0ba9eb50eab35c40ceb
 EBUILD w3m-0.5.2.ebuild 2843 RMD160 80b57f81897b6ee8b6d0d729ec19777da31da5fc SHA1 9b622cf526742f10c3f6f083d1f6ac99bef70695 SHA256 2d03f839d7e08b12e24c75fa3383443bdbc9ccb4b30382fe197af6abffed6843
-MISC ChangeLog 16615 RMD160 58b9e2dc52c6fba0d6334734cd10f0ab772c670e SHA1 c6036574e366d49bf9ce9a435e35eb0e70870f74 SHA256 93171b30fa106e8c3e7a9f17e98e3b15015524eb8c16d5c67af7c764ece8fd0a
+MISC ChangeLog 16826 RMD160 bc394c83428cdfab5708b2c51852addf849d35c1 SHA1 90bee9a588e16f8708fb619e81b7f89d08890311 SHA256 e72a37e21762a43f0cd9e070a05c5eaa7c6b6774195a9b94f684638984193d14
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/www-client/w3m/files/w3m-0.5.2-form.patch b/www-client/w3m/files/w3m-0.5.2-form.patch
new file mode 100644
index 000000000000..6616319c7b28
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.2-form.patch
@@ -0,0 +1,11 @@
+diff -Naur w3m-0.5.2.orig/form.c w3m-0.5.2/form.c
+--- w3m-0.5.2.orig/form.c	2004-02-06 02:23:07.000000000 +0900
++++ w3m-0.5.2/form.c	2008-05-16 08:34:48.000000000 +0900
+@@ -403,6 +403,7 @@
+     line->lineBuf = buf;
+     line->propBuf = prop;
+     line->len = len;
++    line->size = len;
+ 
+     return pos;
+ }
diff --git a/www-client/w3m/files/w3m.mailcap b/www-client/w3m/files/w3m.mailcap
new file mode 100644
index 000000000000..21603a6dc3a2
--- /dev/null
+++ b/www-client/w3m/files/w3m.mailcap
@@ -0,0 +1 @@
+application/xhtml+xml; cat %s; x-htmloutput
diff --git a/www-client/w3m/w3m-0.5.2-r2.ebuild b/www-client/w3m/w3m-0.5.2-r2.ebuild
new file mode 100644
index 000000000000..1aae25d0a91f
--- /dev/null
+++ b/www-client/w3m/w3m-0.5.2-r2.ebuild
@@ -0,0 +1,120 @@
+# 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-r2.ebuild,v 1.1 2008/05/15 23:53:33 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"
+}
+
+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
+}