Removed cjk IUSE flag and make multilingual enhancement enabled by default to fix bug #38608

4 files changed, 164 insertions, 6 deletions

diff --git a/net-www/w3mmee/Manifest b/net-www/w3mmee/Manifest
index 3b1171ad219c..ae4394dfc8fc 100644
--- a/net-www/w3mmee/Manifest
+++ b/net-www/w3mmee/Manifest
@@ -1,9 +1,9 @@
-MD5 85cc09a5c884fcc60c7b08ec38cd8677 w3mmee-0.3.2_p24-r2.ebuild 3794
+MD5 fc175fbea67bc78654c3a04a6d6055a0 w3mmee-0.3.2_p24-r2.ebuild 3793
 MD5 c063fc528249a47ca165c2d80e25c840 w3mmee-0.3.2_p24.ebuild 3190
 MD5 66968049a165433c1cbcde1e1ca4ebee w3mmee-0.3.2_p24-r1.ebuild 3803
-MD5 05428bf3235444be064dda0077223f55 ChangeLog 904
+MD5 b07e1bb25a9faeea5993ea64b9cb0dda ChangeLog 1145
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 ef619355623033a8e972a859be20d64f w3mmee-0.3.2_p24-r3.ebuild 3698
+MD5 a2d15a78be6a383c8d7946ced961a2e2 w3mmee-0.3.2_p24-r3.ebuild 3698
 MD5 11b8aad1ed8c0a1c9fee654d930d70d8 files/digest-w3mmee-0.3.2_p24-r1 122
 MD5 60d6392393f2f69cea53fbacc9447fe0 files/digest-w3mmee-0.3.2_p24-r2 122
 MD5 ea771adfe70c29aec2c33d9cc4717eb3 files/w3mmee-w3mman-gentoo.diff 1037
diff --git a/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24-r3 b/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24-r3
new file mode 100644
index 000000000000..a9d66d2155eb
--- /dev/null
+++ b/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24-r3
@@ -0,0 +1,2 @@
+MD5 da1df0292cfc3f7c661f3916d013fe10 w3mmee-p24-19.tar.gz 686742
+MD5 15492b14ca7b9a9e035238611e9cd1e3 gc6.2.tar.gz 750883
diff --git a/net-www/w3mmee/w3mmee-0.3.2_p24-r2.ebuild b/net-www/w3mmee/w3mmee-0.3.2_p24-r2.ebuild
index 7f0b5e6b13c3..72f6fa9b9d71 100644
--- a/net-www/w3mmee/w3mmee-0.3.2_p24-r2.ebuild
+++ b/net-www/w3mmee/w3mmee-0.3.2_p24-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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-r2.ebuild,v 1.1 2003/12/06 12:16:27 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3mmee/w3mmee-0.3.2_p24-r2.ebuild,v 1.2 2004/01/18 19:35:57 usata Exp $
 
 inherit alternatives
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://pub.ks-and-ks.ne.jp/prog/w3mmee/"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~x86 -alpha"
+KEYWORDS="x86 -alpha"
 
 DEPEND=">=sys-libs/ncurses-5.2-r3
 	>=sys-libs/zlib-1.1.3-r2
diff --git a/net-www/w3mmee/w3mmee-0.3.2_p24-r3.ebuild b/net-www/w3mmee/w3mmee-0.3.2_p24-r3.ebuild
new file mode 100644
index 000000000000..481268581508
--- /dev/null
+++ b/net-www/w3mmee/w3mmee-0.3.2_p24-r3.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2004 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-r3.ebuild,v 1.1 2004/01/18 19:35:57 usata Exp $
+
+inherit alternatives
+
+IUSE="gpm imlib nls ssl"
+
+MY_PV=${PV##*_}-19
+MY_P=${PN}-${MY_PV}
+GC_PV="6.2"
+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"
+
+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 [ -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
+
+	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
+}