Defaults to US-ASCII when USE="-cjk", closing Bug #34285

4 files changed, 157 insertions, 3 deletions

diff --git a/net-www/w3m/ChangeLog b/net-www/w3m/ChangeLog
index d5aa6a22a9eb..bf6284f021d0 100644
--- a/net-www/w3m/ChangeLog
+++ b/net-www/w3m/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/w3m
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.41 2003/11/23 08:24:56 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.42 2003/11/26 16:26:03 usata Exp $
+
+*w3m-0.4.2-r4 (27 Nov 2003)
+
+  27 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r4.ebuild:
+  Fixed strange character problem
 
   14 Nov 2003; Brad House <brad_mssw@gentoo.org> w3m-0.4.2.ebuild:
   mark stable on amd64
diff --git a/net-www/w3m/Manifest b/net-www/w3m/Manifest
index ce442231c3ad..b21be3343dca 100644
--- a/net-www/w3m/Manifest
+++ b/net-www/w3m/Manifest
@@ -1,8 +1,8 @@
-MD5 42673c54d1a3f815b068301a74f44e60 ChangeLog 8144
+MD5 a28100c1f4880c7ca84df60d5050e457 ChangeLog 8278
 MD5 80336cc333808be2244addf73f68a2eb w3m-0.4.2-r3.ebuild 3729
 MD5 efd0e7ec20245e58a27edc22a41e8d04 w3m-0.4.2-r2.ebuild 3323
 MD5 e1809813737d3273b17639d3f9cccc2b w3m-0.4.2.ebuild 1949
-MD5 247afbc5263aa03699960dae6e282983 w3m-0.4.2-r4.ebuild 3816
+MD5 1dcf1a7dc12a6725b9062ab7b677e7c4 w3m-0.4.2-r4.ebuild 3849
 MD5 1f7b8fffb13d61fe43a3294dcf037926 w3m-0.3.2.2.ebuild 3732
 MD5 003ecc09459bb3933a50d51c2b757630 w3m-0.4.ebuild 4437
 MD5 7676892f874fdeefb6cc8dac727f6558 w3m-0.4.1-r3.ebuild 2381
diff --git a/net-www/w3m/files/digest-w3m-0.4.2-r4 b/net-www/w3m/files/digest-w3m-0.4.2-r4
new file mode 100644
index 000000000000..c33d4a0f18ca
--- /dev/null
+++ b/net-www/w3m/files/digest-w3m-0.4.2-r4
@@ -0,0 +1,2 @@
+MD5 7246ebdcb27645a8a95beb64902068dd w3m-cvs-1.890.tar.gz 1888635
+MD5 3acc62da58551ce9991d234f19b8fe4d w3m-cvs-1.890-async-3.diff.gz 78562
diff --git a/net-www/w3m/w3m-0.4.2-r4.ebuild b/net-www/w3m/w3m-0.4.2-r4.ebuild
new file mode 100644
index 000000000000..7a68fcff2239
--- /dev/null
+++ b/net-www/w3m/w3m-0.4.2-r4.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.2-r4.ebuild,v 1.1 2003/11/26 16:26:03 usata Exp $
+
+IUSE="X nopixbuf imlib imlib2 xface ssl migemo gpm cjk"
+#IUSE="canna"
+
+W3M_CVS_PV="1.890"
+W3M_CVS_P="${PN}-cvs-${W3M_CVS_PV}"
+
+DESCRIPTION="Text based WWW browser, supports tables and frames"
+SRC_URI="mirror://gentoo/${W3M_CVS_P}.tar.gz
+	http://dev.gentoo.org/~usata/distfiles/${W3M_CVS_P}.tar.gz
+	http://www.page.sannet.ne.jp/knabe/w3m/${W3M_CVS_P}-async-3.diff.gz"
+# canna? ( http://www.j10n.org/files/${W3M_CVS_P}-canna.patch )"
+
+HOMEPAGE="http://w3m.sourceforge.net/"
+
+SLOT="0"
+LICENSE="w3m"
+# since it is a CVS snapshot, we better not change keywords to stable
+KEYWORDS="~x86 ~alpha ~ppc ~sparc"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.57"
+# canna? ( app-i18n/canna )
+RDEPEND=">=sys-libs/ncurses-5.2-r3
+	>=sys-libs/zlib-1.1.3-r2
+	>=dev-libs/boehm-gc-6.2
+	X? ( || ( !nopixbuf? ( >=media-libs/gdk-pixbuf-0.22.0 )
+		imlib2? ( >=media-libs/imlib2-1.1.0-r2 )
+		imlib? ( >=media-libs/imlib-1.9.8 )
+		virtual/glibc )
+	)
+	!X? ( imlib2? ( >=media-libs/imlib2-1.1.0-r2 ) )
+	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/textbrowser
+	virtual/w3m"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+
+	if [ -n "`use X`" -a -n "`use nopixbuf`" -a -z "`use imlib2`" -a -z "`use imlib`" ] ; then
+		ewarn
+		ewarn "If you set USE=\"nopixbuf\" (disable gdk-pixbuf for w3mimgdisplay),"
+		ewarn "you need to enable either imlib2 or imlib USE flag."
+		ewarn
+		die "w3m requires gdk-pixbuf, imlib2 or imlib for image support."
+	fi
+}
+
+src_unpack() {
+
+	unpack ${W3M_CVS_P}.tar.gz
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
+	epatch ${DISTDIR}/${W3M_CVS_P}-async-3.diff.gz
+	epatch ${FILESDIR}/${PN}-async-gpm-gentoo.diff
+	epatch ${FILESDIR}/${PN}-async-dlpanel-gentoo.diff
+	#use canna && epatch ${DISTDIR}/${W3M_CVS_P}-canna.patch
+}
+
+src_compile() {
+
+	export WANT_AUTOCONF_2_5=1
+	#autoconf || die "autoconf failed"
+
+	local myconf migemo_command imagelib
+
+	if [ -n "`use X`" ] ; then
+		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
+		if [ ! -n "`use nopixbuf`" ] ; then
+			imagelib="gdk-pixbuf"
+		elif [ -n "`use imlib2`" ] ; then
+			imagelib="imlib2"
+		elif [ -n "`use imlib`" ] ; then
+			imagelib="imlib"
+		else
+			# defaults to gdk-pixbuf
+			imagelib="gdk-pixbuf"
+		fi
+	else
+		if [ -n "`use imlib2`" ] ; then
+			myconf="${myconf} --enable-image=fb"
+			imagelib="imlib2"
+		else
+			myconf="${myconf} --enable-image=no"
+			imagelib="no"
+		fi
+	fi
+
+	if [ -n "`use migemo`" ] ; then
+		migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
+	else
+		migemo_command="no"
+	fi
+
+	if [ -n "`use cjk`" ] ; then
+		myconf="${myconf}
+			--enable-japanese=E
+			--with-charset=EUC-JP"
+	else
+		myconf="${myconf}
+			--with-charset=US-ASCII"
+	fi
+
+	# You can't disable cjk and nls at the moment(w3mhelper hangs)
+	# `use_enable nls` `use_enable cjk`
+	# You can't disable unicode(build fails)
+	# `use_enable unicode`
+	econf --enable-keymap=w3m \
+		--with-editor=/usr/bin/nano \
+		--with-mailer=/bin/mail \
+		--with-browser=/usr/bin/mozilla \
+		--with-termlib=ncurses \
+		--with-imagelib="${imagelib}" \
+		--with-migemo="${migemo_command}" \
+		--enable-m17n \
+		`use_enable gpm mouse` \
+		`use_enable ssl digest-auth` \
+		`use_with ssl` \
+		${myconf} "$@" || die
+		# `use_with canna`
+
+	# emake borked
+	make all || make 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 [ -n "`use cjk`" ] ; then
+		docinto doc-jp ; dodoc doc-jp/*
+	else
+		rm -rf ${D}/usr/share/man/ja
+	fi
+}