6 files changed, 175 insertions, 19 deletions
diff --git a/www-client/netscape/Manifest b/www-client/netscape/Manifest
index 2c994a90a399..40d225e21ec9 100644
--- a/www-client/netscape/Manifest
+++ b/www-client/netscape/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 5fc6db14145006f63b64ec51d9936daf ChangeLog 530
 MD5 3ff31b5479b2a0244f5711fff3155aed metadata.xml 221
-MD5 fb411baeecc9e44ea03c9cd13187808e netscape-7.2.ebuild 2518
-MD5 e66c05ce466a169bf69b9982f8f26527 ChangeLog 408
+MD5 448f7f9dfeadb02955ceb663f735a06b netscape-7.2.ebuild 2526
 MD5 1356e62f21a99bbf8c79bedc63e14299 files/digest-netscape-7.2 84
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCBFGWVWNWqTUmv+0RAh7oAJ9PwHgX2FKK+iEmmOGrR7o4/50WXQCfUGxS
-O5vOHLuSKPGn4UrRvuGryZQ=
-=B/Lk
------END PGP SIGNATURE-----
diff --git a/www-client/w3mmee/ChangeLog b/www-client/w3mmee/ChangeLog
index b6f44f0acba2..a476d18bb394 100644
--- a/www-client/w3mmee/ChangeLog
+++ b/www-client/w3mmee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/w3mmee
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/ChangeLog,v 1.1 2004/09/08 14:11:45 usata Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/ChangeLog,v 1.2 2005/02/12 16:08:05 usata Exp $
+
+*w3mmee-0.3.2_p24-r5 (13 Feb 2005)
+
+  13 Feb 2005; Mamoru KOMACHI <usata@gentoo.org>
+  +w3mmee-0.3.2_p24-r5.ebuild:
+  Version bumped.
 
 *w3mmee-0.3.2_p24-r4 (08 Sep 2004)
 
diff --git a/www-client/w3mmee/Manifest b/www-client/w3mmee/Manifest
index 33e6f2162b95..593c0cc1737a 100644
--- a/www-client/w3mmee/Manifest
+++ b/www-client/w3mmee/Manifest
@@ -1,5 +1,7 @@
-MD5 d160b0cbc41cc8dec92eeff19a2e8e31 ChangeLog 2636
+MD5 539ce98e3c40e0bc3d5ce65b89475f9a ChangeLog 2771
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 bc355978c753afcb034956f61f6546b3 w3mmee-0.3.2_p24-r4.ebuild 3664
-MD5 ea771adfe70c29aec2c33d9cc4717eb3 files/w3mmee-w3mman-gentoo.diff 1037
+MD5 55b5b1513326614c099bc34e891db87f w3mmee-0.3.2_p24-r4.ebuild 3664
+MD5 8a7eafa6615489d922421006fe32e33b w3mmee-0.3.2_p24-r5.ebuild 3667
 MD5 06e2f7d92b34d5dad6ae24fba7b1abe8 files/digest-w3mmee-0.3.2_p24-r4 122
+MD5 ea771adfe70c29aec2c33d9cc4717eb3 files/w3mmee-w3mman-gentoo.diff 1037
+MD5 a3c9ebac65b9616e938aff38000305b9 files/digest-w3mmee-0.3.2_p24-r5 122
diff --git a/www-client/w3mmee/files/digest-w3mmee-0.3.2_p24-r5 b/www-client/w3mmee/files/digest-w3mmee-0.3.2_p24-r5
new file mode 100644
index 000000000000..2107f3ec2e0b
--- /dev/null
+++ b/www-client/w3mmee/files/digest-w3mmee-0.3.2_p24-r5
@@ -0,0 +1,2 @@
+MD5 b57304e272fad1304eee1f0de28cacfe w3mmee-p24-22.tar.gz 690094
+MD5 ef03495e980b834a99c0e27eedaa546e gc6.4.tar.gz 778553
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r4.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r4.ebuild
index 839a98d9a4ec..768c1313d3ae 100644
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r4.ebuild
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/w3mmee-0.3.2_p24-r4.ebuild,v 1.1 2004/09/08 14:11:45 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/w3mmee-0.3.2_p24-r4.ebuild,v 1.2 2005/02/12 16:08:05 usata Exp $
 
 inherit alternatives eutils
 
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r5.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r5.ebuild
new file mode 100644
index 000000000000..d95270a963f4
--- /dev/null
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r5.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/w3mmee-0.3.2_p24-r5.ebuild,v 1.1 2005/02/12 16:08:05 usata Exp $
+
+inherit alternatives eutils
+
+IUSE="gpm imlib nls ssl"
+
+MY_PV=${PV##*_}-22
+MY_P=${PN}-${MY_PV}
+GC_PV="6.4"
+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 ~sparc ~ppc"
+
+DEPEND=">=sys-libs/ncurses-5.2-r3
+	>=sys-libs/zlib-1.1.3-r2
+	dev-lang/perl
+	>=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
+
+	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
+}
+
+src_compile() {
+
+	local myconf myuse mylang
+	myuse="use_cookie=y use_ansi_color=y use_history=y
+		display_code=E system_code=E"
+
+	if 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 use gpm ; then
+		myuse="${myuse} use_mouse=y"
+	else
+		myuse="${myuse} use_mouse=n"
+	fi
+
+	if use nls ; then
+		myconf="${myconf} -locale_dir=/usr/share/locale"
+	else
+		myconf="${myconf} -locale_dir='(NONE)'"
+	fi
+
+	if 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
+
+	cat >>config.param<<-EOF
+	lang=MANY
+	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 \
+		-libmoe=/usr/lib \
+		-mb_h=/usr/include/moe \
+		-mk_btri=/usr/libexec/moe \
+		-cflags=${CFLAGS} -ldflags=${LDFLAGS} \
+		${myconf} || die
+
+	emake || die "emake 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
+
+	dodoc 00INCOMPATIBLE.html ChangeLog NEWS* README
+	docinto en
+	dodoc doc/*
+	docinto jp
+	dodoc doc-jp/*
+}
+
+pkg_postinst() {
+
+	w3m_alternatives
+	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
+}
+
+pkg_postrm() {
+
+	w3m_alternatives
+}
+
+w3m_alternatives() {
+
+	if [ ! -f /usr/bin/w3m ] ; then
+		alternatives_makesym /usr/bin/w3m \
+			/usr/bin/w3m{m17n,mee}
+		alternatives_makesym /usr/bin/w3mman \
+			/usr/bin/w3m{man-m17n,meeman}
+		alternatives_makesym /usr/share/man/ja/man1/w3m.1.gz \
+			/usr/share/man/ja/man1/w3m{m17n,mee}.1.gz
+		alternatives_makesym /usr/share/man/man1/w3m.1.gz \
+			/usr/share/man/man1/w3m{m17n,mee}.1.gz
+		alternatives_makesym /usr/share/man/man1/w3mman.1.gz \
+			/usr/share/man/man1/w3m{man-m17n,meeman}.1.gz
+	fi
+}