fixed escape character problem with w3mmeeman

5 files changed, 163 insertions, 7 deletions

diff --git a/net-www/w3mmee/ChangeLog b/net-www/w3mmee/ChangeLog
index 5872b484b7d8..0902cf1460a8 100644
--- a/net-www/w3mmee/ChangeLog
+++ b/net-www/w3mmee/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-www/w3mmee
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3mmee/ChangeLog,v 1.1 2003/08/07 19:03:35 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3mmee/ChangeLog,v 1.2 2003/08/22 14:41:46 usata Exp $
+
+*w3mmee-0.3.2_p24-r1 (22 Aug 2003)
+
+  22 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> w3mmee-0.3.2_p24-r1.ebuild:
+  Fixed escape character problem of viewing Japanese manpages with w3mmeeman.
+  Creates symlinks if w3m is not present
+
+*w3mmee-0.3.2_p24 (08 Aug 2003)
+
+  22 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> w3mmee-0.3.2_p24.ebuild:
+  Marked stable on x86 and ppc
 
   08 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> :
   Initial import
diff --git a/net-www/w3mmee/Manifest b/net-www/w3mmee/Manifest
index a9e503690c61..9d09cf5799c0 100644
--- a/net-www/w3mmee/Manifest
+++ b/net-www/w3mmee/Manifest
@@ -1,6 +1,5 @@
-MD5 45774ff1dc24d34c11956778158f1b1f w3mmee-0.3.2_p24.ebuild 3198
-MD5 087c8607503324519cb9854c120e7871 ChangeLog 278
-MD5 73e13306f18375e2b0b3cc822b7217ba w3mmee-0.3.2_p24-r1.ebuild 3534
-MD5 45774ff1dc24d34c11956778158f1b1f w3mmee-0.3.2_p24-r1.ebuild.bak 3198
+MD5 d3b84a6f5f8eb637c13e75b0de7738db w3mmee-0.3.2_p24.ebuild 3196
+MD5 5fcef2ab77e3fb4a117fe9073082d5d5 ChangeLog 650
+MD5 021528e0d96c1a0acd33f3e971debd1b w3mmee-0.3.2_p24-r1.ebuild 3520
 MD5 f3849df5e12431b2ea556723397a2c6f files/digest-w3mmee-0.3.2_p24 128
 MD5 f3849df5e12431b2ea556723397a2c6f files/digest-w3mmee-0.3.2_p24-r1 128
diff --git a/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24-r1 b/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24-r1
new file mode 100644
index 000000000000..493e06716595
--- /dev/null
+++ b/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24-r1
@@ -0,0 +1,2 @@
+MD5 4bad740a3ac0e6d91b1bc6027106478f w3mmee-p24-18.tar.gz 686460
+MD5 b703cf7ddda01ec625761abc46c84f41 gc6.3alpha1.tar.gz 751592
diff --git a/net-www/w3mmee/w3mmee-0.3.2_p24-r1.ebuild b/net-www/w3mmee/w3mmee-0.3.2_p24-r1.ebuild
new file mode 100644
index 000000000000..45c1499e9be1
--- /dev/null
+++ b/net-www/w3mmee/w3mmee-0.3.2_p24-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3mmee/w3mmee-0.3.2_p24-r1.ebuild,v 1.1 2003/08/22 14:41:46 usata Exp $
+
+IUSE="cjk gpm imlib nls ssl"
+
+MY_PV=${PV##*_}-18
+MY_P=${PN}-${MY_PV}
+GC_PV="6.3alpha1"
+MY_GC=gc${GC_PV}
+
+DESCRIPTION="A variant of w3m with support for multiple character encodings"
+SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${MY_P}.tar.gz
+	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${MY_GC}.tar.gz"
+HOMEPAGE="http://pub.ks-and-ks.ne.jp/prog/w3mmee/"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~x86 -alpha ~ppc ~sparc"
+
+DEPEND=">=sys-libs/ncurses-5.2-r3
+	>=sys-libs/zlib-1.1.3-r2
+	dev-lang/perl
+	cjk? ( >=dev-libs/libmoe-1.5.3 )
+	imlib? ( >=media-libs/imlib-1.9.8
+		media-libs/compface )
+	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
+	nls? ( sys-devel/gettext )
+	ssl? ( >=dev-libs/openssl-0.9.6b )"
+
+PROVIDE="virtual/textbrowser
+	virtual/w3m"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+
+	unpack ${MY_P}.tar.gz
+	cd ${S}
+
+	# w3mmee doesn't come with boehm-gc unlike w3m and w3m-m17n.
+	# However, w3mmee cannot be compiled with system gc
+	# (Debian is the only Linux distribution that can compile it)
+	unpack ${MY_GC}.tar.gz
+	mv ${MY_GC} gc
+}
+
+src_compile() {
+
+	local myconf myuse mylang
+	myuse="use_cookie=y use_ansi_color=y use_history=y
+		display_code=E system_code=E"
+
+	if [ -n "`use ssl`" ] ; then
+		myconf="${myconf} --ssl-includedir=/usr/include/openssl
+			--ssl-libdir=/usr/lib"
+		myuse="${myuse} use_ssl=y use_ssl_verify=y
+			use_digest_auth=y"
+	else
+		myuse="${myuse} use_ssl=n"
+	fi
+
+	if [ -n "`use gpm`" ] ; then
+		myuse="${myuse} use_mouse=y"
+	else
+		myuse="${myuse} use_mouse=n"
+	fi
+
+	if [ -n "`use nls`" ] ; then
+		myconf="${myconf} -locale_dir=/usr/share/locale"
+	else
+		myconf="${myconf} -locale_dir='(NONE)'"
+	fi
+
+	if [ -n "`use imlib`" ] ; then
+		myuse="${myuse} use_image=y use_w3mimg_x11=y
+		use_w3mimg_fb=n w3mimgdisplay_setuid=n use_xface=y"
+	else
+		myuse="${myuse} use_image=n"
+	fi
+
+	if [ -n "`use cjk`" ] ; then
+		myconf="${myconf} -libmoe=/usr/lib
+		-mb_h=/usr/include/moe -mk_btri=/usr/libexec/moe"
+		mylang=MANY
+	else
+		mylang=EN
+	fi
+
+	cat >>config.param<<-EOF
+	lang=${mylang}
+	accept_lang=en
+	EOF
+
+	env ${myuse} ./configure -nonstop \
+		-prefix=/usr \
+		-suffix=mee \
+		-auxbindir=/usr/lib/w3mmee \
+		-libdir=/usr/lib/w3mmee/cgi-bin \
+		-helpdir=/usr/share/w3mmee \
+		-mandir=/usr/share/man \
+		-sysconfdir=/etc/w3mmee \
+		-model=custom \
+		-cflags=${CFLAGS} -ldflags=${LDFLAGS} \
+		${myconf} || die
+
+	emake MAN='env LC_MESSAGES=$${LC_MESSAGES:-$${LC_ALL:-$${LANG}}} LANG=C man' || die "make failed"
+}
+
+src_install() {
+
+	einstall DESTDIR=${D}
+
+	# w3mman and manpages conflict with those from w3m
+	mv ${D}/usr/bin/w3m{,mee}man
+	mv ${D}/usr/share/man/ja/man1/w3m{,mee}.1
+	mv ${D}/usr/share/man/man1/w3m{,mee}.1
+	mv ${D}/usr/share/man/man1/w3mman{,mee}.1
+
+	# creates symlinks if w3m is not installed
+	if [ ! -e /usr/bin/w3m ] ; then
+		dosym /usr/bin/w3m{mee,}
+		dosym /usr/bin/w3m{mee,}man
+		dosym /usr/share/man/ja/man1/w3m{mee,}.1
+		dosym /usr/share/man/man1/w3m{mee,}.1
+		dosym /usr/share/man/man1/w3m{mee,}man.1
+	fi
+
+	dodoc 00INCOMPATIBLE.html ChangeLog NEWS* README
+	docinto en
+	dodoc doc/*
+	docinto jp
+	dodoc doc-jp/*
+}
+
+pkg_postinst() {
+
+	einfo
+	einfo "If you want to render multilingual text, please refer to"
+	einfo "/usr/share/doc/${P}/en/README.mee or"
+	einfo "/usr/share/doc/${P}/jp/README.mee"
+	einfo "and set W3MLANG variable respectively."
+	einfo
+}
diff --git a/net-www/w3mmee/w3mmee-0.3.2_p24.ebuild b/net-www/w3mmee/w3mmee-0.3.2_p24.ebuild
index 800da0e4d6e7..8c7d8e478a17 100644
--- a/net-www/w3mmee/w3mmee-0.3.2_p24.ebuild
+++ b/net-www/w3mmee/w3mmee-0.3.2_p24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3mmee/w3mmee-0.3.2_p24.ebuild,v 1.1 2003/08/07 19:03:35 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3mmee/w3mmee-0.3.2_p24.ebuild,v 1.2 2003/08/22 14:41:46 usata Exp $
 
 IUSE="cjk gpm imlib nls ssl"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://pub.ks-and-ks.ne.jp/prog/w3mmee/"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~x86 -alpha ~ppc ~sparc"
+KEYWORDS="x86 -alpha ppc ~sparc"
 
 DEPEND=">=sys-libs/ncurses-5.2-r3
 	>=sys-libs/zlib-1.1.3-r2