Version bumped. Added a patch to fix w3meeman. Use alternatives.eclass. Changed GC version to 6.2

10 files changed, 237 insertions, 22 deletions

diff --git a/net-www/w3mmee/ChangeLog b/net-www/w3mmee/ChangeLog
index 0902cf1460a8..ecc1f5208883 100644
--- a/net-www/w3mmee/ChangeLog
+++ b/net-www/w3mmee/ChangeLog
@@ -1,6 +1,13 @@
 # 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.2 2003/08/22 14:41:46 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3mmee/ChangeLog,v 1.3 2003/12/06 12:16:27 usata Exp $
+
+*w3mmee-0.3.2_p24-r2 (06 Dec 2003)
+
+  06 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> metadata.xml,
+  w3mmee-0.3.2_p24-r1.ebuild, w3mmee-0.3.2_p24-r2.ebuild,
+  w3mmee-0.3.2_p24.ebuild, files/w3mmee-w3mman-gentoo.diff:
+  w3mmee-0.4.2-p24.19 was released.
 
 *w3mmee-0.3.2_p24-r1 (22 Aug 2003)
 
diff --git a/net-www/w3mmee/Manifest b/net-www/w3mmee/Manifest
index 47eb20654c18..c037e89d3f31 100644
--- a/net-www/w3mmee/Manifest
+++ b/net-www/w3mmee/Manifest
@@ -1,8 +1,8 @@
-MD5 8b5f99641664a276400d770aebf4d648 w3mmee-0.3.2_p24.ebuild 3190
+MD5 c063fc528249a47ca165c2d80e25c840 w3mmee-0.3.2_p24.ebuild 3190
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 961797ebf42c861f0cb2556dccbd523b ChangeLog 904
-MD5 1d7c584303d9fdff8db011bfd6606fbf w3mmee-0.3.2_p24-r1.ebuild 3803
-MD5 bcdbf409ff532d026605cd26a6002091 w3mmee-0.3.2_p24-r2.ebuild 3789
+MD5 05428bf3235444be064dda0077223f55 ChangeLog 904
+MD5 66968049a165433c1cbcde1e1ca4ebee w3mmee-0.3.2_p24-r1.ebuild 3803
+MD5 85cc09a5c884fcc60c7b08ec38cd8677 w3mmee-0.3.2_p24-r2.ebuild 3794
 MD5 11b8aad1ed8c0a1c9fee654d930d70d8 files/digest-w3mmee-0.3.2_p24 122
 MD5 11b8aad1ed8c0a1c9fee654d930d70d8 files/digest-w3mmee-0.3.2_p24-r1 122
 MD5 60d6392393f2f69cea53fbacc9447fe0 files/digest-w3mmee-0.3.2_p24-r2 122
diff --git a/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24 b/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24
index 493e06716595..5b16104ea753 100644
--- a/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24
+++ b/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24
@@ -1,2 +1,2 @@
 MD5 4bad740a3ac0e6d91b1bc6027106478f w3mmee-p24-18.tar.gz 686460
-MD5 b703cf7ddda01ec625761abc46c84f41 gc6.3alpha1.tar.gz 751592
+MD5 15492b14ca7b9a9e035238611e9cd1e3 gc6.2.tar.gz 750883
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
index 493e06716595..5b16104ea753 100644
--- a/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24-r1
+++ b/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24-r1
@@ -1,2 +1,2 @@
 MD5 4bad740a3ac0e6d91b1bc6027106478f w3mmee-p24-18.tar.gz 686460
-MD5 b703cf7ddda01ec625761abc46c84f41 gc6.3alpha1.tar.gz 751592
+MD5 15492b14ca7b9a9e035238611e9cd1e3 gc6.2.tar.gz 750883
diff --git a/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24-r2 b/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24-r2
new file mode 100644
index 000000000000..a9d66d2155eb
--- /dev/null
+++ b/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24-r2
@@ -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/files/w3mmee-w3mman-gentoo.diff b/net-www/w3mmee/files/w3mmee-w3mman-gentoo.diff
new file mode 100644
index 000000000000..967e679f02b2
--- /dev/null
+++ b/net-www/w3mmee/files/w3mmee-w3mman-gentoo.diff
@@ -0,0 +1,23 @@
+diff -urN w3mmee-p24-19.ORIG/scripts/w3mman/w3mman.in w3mmee-p24-19/scripts/w3mman/w3mman.in
+--- w3mmee-p24-19.ORIG/scripts/w3mman/w3mman.in	2002-03-17 14:07:08.000000000 +0900
++++ w3mmee-p24-19/scripts/w3mman/w3mman.in	2003-12-06 20:49:15.000000000 +0900
+@@ -1,7 +1,7 @@
+ #!@PERL@
+ 
+ @W3M = split(' ', '@W3M@');
+-$ENV{'MAN'} = '@MAN@';
++$ENV{'MAN'} = 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@';
+ $SCRIPT = 'file:///$LIB/w3mman2html.cgi';
+ 
+ sub usage {
+diff -urN w3mmee-p24-19.ORIG/scripts/w3mman/w3mman2html.cgi.in w3mmee-p24-19/scripts/w3mman/w3mman2html.cgi.in
+--- w3mmee-p24-19.ORIG/scripts/w3mman/w3mman2html.cgi.in	2002-03-17 14:07:08.000000000 +0900
++++ w3mmee-p24-19/scripts/w3mman/w3mman2html.cgi.in	2003-12-06 20:49:53.000000000 +0900
+@@ -1,6 +1,6 @@
+ #!@PERL@
+ 
+-$MAN = $ENV{'MAN'} || '@MAN@';
++$MAN = $ENV{'MAN'} || 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@';
+ $QUERY = $ENV{'QUERY_STRING'} || $ARGV[0];
+ $SCRIPT_NAME = $ENV{'SCRIPT_NAME'} || $0;
+ $CGI = "file://$SCRIPT_NAME";
diff --git a/net-www/w3mmee/metadata.xml b/net-www/w3mmee/metadata.xml
new file mode 100644
index 000000000000..2d5852c16c60
--- /dev/null
+++ b/net-www/w3mmee/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>cjk</herd>
+</pkgmetadata>
diff --git a/net-www/w3mmee/w3mmee-0.3.2_p24-r1.ebuild b/net-www/w3mmee/w3mmee-0.3.2_p24-r1.ebuild
index 45c1499e9be1..c1d6293140bb 100644
--- a/net-www/w3mmee/w3mmee-0.3.2_p24-r1.ebuild
+++ b/net-www/w3mmee/w3mmee-0.3.2_p24-r1.ebuild
@@ -1,12 +1,14 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3mmee/w3mmee-0.3.2_p24-r1.ebuild,v 1.2 2003/12/06 12:16:27 usata Exp $
+
+inherit alternatives
 
 IUSE="cjk gpm imlib nls ssl"
 
 MY_PV=${PV##*_}-18
 MY_P=${PN}-${MY_PV}
-GC_PV="6.3alpha1"
+GC_PV="6.2"
 MY_GC=gc${GC_PV}
 
 DESCRIPTION="A variant of w3m with support for multiple character encodings"
@@ -16,7 +18,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
@@ -43,6 +45,8 @@ src_unpack() {
 	# (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() {
@@ -104,7 +108,7 @@ src_compile() {
 		-cflags=${CFLAGS} -ldflags=${LDFLAGS} \
 		${myconf} || die
 
-	emake MAN='env LC_MESSAGES=$${LC_MESSAGES:-$${LC_ALL:-$${LANG}}} LANG=C man' || die "make failed"
+	emake || die "emake failed"
 }
 
 src_install() {
@@ -117,15 +121,6 @@ src_install() {
 	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/*
@@ -135,6 +130,7 @@ src_install() {
 
 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"
@@ -142,3 +138,24 @@ pkg_postinst() {
 	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
+}
diff --git a/net-www/w3mmee/w3mmee-0.3.2_p24-r2.ebuild b/net-www/w3mmee/w3mmee-0.3.2_p24-r2.ebuild
new file mode 100644
index 000000000000..7f0b5e6b13c3
--- /dev/null
+++ b/net-www/w3mmee/w3mmee-0.3.2_p24-r2.ebuild
@@ -0,0 +1,161 @@
+# 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-r2.ebuild,v 1.1 2003/12/06 12:16:27 usata Exp $
+
+inherit alternatives
+
+IUSE="cjk 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
+	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
+
+	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
+
+	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 || 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
+}
diff --git a/net-www/w3mmee/w3mmee-0.3.2_p24.ebuild b/net-www/w3mmee/w3mmee-0.3.2_p24.ebuild
index 8c7d8e478a17..9507267f527f 100644
--- a/net-www/w3mmee/w3mmee-0.3.2_p24.ebuild
+++ b/net-www/w3mmee/w3mmee-0.3.2_p24.ebuild
@@ -1,12 +1,12 @@
 # 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.2 2003/08/22 14:41:46 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3mmee/w3mmee-0.3.2_p24.ebuild,v 1.3 2003/12/06 12:16:27 usata Exp $
 
 IUSE="cjk gpm imlib nls ssl"
 
 MY_PV=${PV##*_}-18
 MY_P=${PN}-${MY_PV}
-GC_PV="6.3alpha1"
+GC_PV="6.2"
 MY_GC=gc${GC_PV}
 
 DESCRIPTION="A variant of w3m with support for multiple character encodings"