Enables migemo if app-emacs/migemo is installed

5 files changed, 63 insertions, 10 deletions

diff --git a/net-www/w3m/ChangeLog b/net-www/w3m/ChangeLog
index 8b09b6de529d..98855ab737ab 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.30 2003/09/23 16:05:41 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.31 2003/09/25 08:45:00 usata Exp $
+
+  25 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.1-r3.ebuild,
+  w3m-0.4.2.ebuild, files/w3m-w3mman-gentoo.diff:
+  Enables migemo if app-emacs/migemo is installed. Split w3mman patch
+  rather than writing down variables directly to ebuilds.
 
   23 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.2.2-r1.ebuild,
   w3m-0.3-r2.ebuild, w3m-0.3-r6.ebuild, w3m-0.3.2.1.ebuild,
diff --git a/net-www/w3m/Manifest b/net-www/w3m/Manifest
index 177ce647dfde..e2dbf55792cb 100644
--- a/net-www/w3m/Manifest
+++ b/net-www/w3m/Manifest
@@ -1,9 +1,10 @@
-MD5 6a02d7fd25374c35ae757c9fc030b2a7 ChangeLog 6042
-MD5 97b0fc5d94ef0a7f1358492dfaaf1e8f w3m-0.4.2.ebuild 1731
+MD5 eb5f2b389b089e6fe9ff3c844e0a427f ChangeLog 6291
+MD5 cd225122584bfad96cb5e0512aad8f48 w3m-0.4.2.ebuild 1944
 MD5 1f7b8fffb13d61fe43a3294dcf037926 w3m-0.3.2.2.ebuild 3732
 MD5 003ecc09459bb3933a50d51c2b757630 w3m-0.4.ebuild 4437
-MD5 d058109292891afef79c3cdab268543d w3m-0.4.1-r3.ebuild 2206
+MD5 7676892f874fdeefb6cc8dac727f6558 w3m-0.4.1-r3.ebuild 2381
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059
 MD5 df74b28e72e6c2140a1dd6e4ea042e58 files/digest-w3m-0.3.2.2 64
 MD5 b289d2ea47e3369102b13b53f2bc47ac files/digest-w3m-0.4 60
 MD5 00a360d12cc07d61c5fd5df08a53d261 files/w3m-0.4-alpha.patch 930
diff --git a/net-www/w3m/files/w3m-w3mman-gentoo.diff b/net-www/w3m/files/w3m-w3mman-gentoo.diff
new file mode 100644
index 000000000000..be0f16e560fa
--- /dev/null
+++ b/net-www/w3m/files/w3m-w3mman-gentoo.diff
@@ -0,0 +1,23 @@
+diff -urN w3m-0.4.2.ORIG/scripts/w3mman/w3mman.in w3m-0.4.2/scripts/w3mman/w3mman.in
+--- w3m-0.4.2.ORIG/scripts/w3mman/w3mman.in	2003-09-25 00:58:27.000000000 +0900
++++ w3m-0.4.2/scripts/w3mman/w3mman.in	2003-09-25 03:12:38.000000000 +0900
+@@ -1,7 +1,7 @@
+ #!@PERL@
+ 
+ @W3M = split(' ', $ENV{'W3MMAN_W3M'} || '@W3M@');
+-$ENV{'W3MMAN_MAN'} ||= '@MAN@';
++$ENV{'W3MMAN_MAN'} ||= 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@';
+ $SCRIPT = 'file:///$LIB/w3mman2html.cgi';
+ 
+ sub usage {
+diff -urN w3m-0.4.2.ORIG/scripts/w3mman/w3mman2html.cgi.in w3m-0.4.2/scripts/w3mman/w3mman2html.cgi.in
+--- w3m-0.4.2.ORIG/scripts/w3mman/w3mman2html.cgi.in	2003-09-25 00:58:27.000000000 +0900
++++ w3m-0.4.2/scripts/w3mman/w3mman2html.cgi.in	2003-09-25 03:12:38.000000000 +0900
+@@ -1,6 +1,6 @@
+ #!@PERL@
+ 
+-$MAN = $ENV{'W3MMAN_MAN'} || '@MAN@';
++$MAN = $ENV{'W3MMAN_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/w3m/w3m-0.4.1-r3.ebuild b/net-www/w3m/w3m-0.4.1-r3.ebuild
index 68e01c205d35..7ad0bafbeba7 100644
--- a/net-www/w3m/w3m-0.4.1-r3.ebuild
+++ b/net-www/w3m/w3m-0.4.1-r3.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/w3m/w3m-0.4.1-r3.ebuild,v 1.3 2003/09/23 16:05:41 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.1-r3.ebuild,v 1.4 2003/09/25 08:45:00 usata Exp $
 
 inherit eutils
 
@@ -31,6 +31,7 @@ src_unpack() {
 	if use alpha; then
 		epatch ${FILESDIR}/w3m-0.4-alpha.patch || die "epatch failed"
 	fi
+	epatch ${FILESDIR}/w3m-w3mman-gentoo.diff
 }
 
 src_compile() {
@@ -66,6 +67,13 @@ src_compile() {
 		myuse="${myuse} use_image=n"
 	fi
 
+	if has_version 'app-emacs/migemo' ; then
+		myuse="${myuse} use_migemo=y"
+		export def_migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
+	else
+		myuse="${myuse} use_migemo=n"
+	fi
+
 	env ${myuse} ./configure ${myconf} || die "configure failed"
 
 	# Test to make sure the above configuration was sane
@@ -78,11 +86,13 @@ src_compile() {
 	make clean
 	cd -
 
-	emake MAN='env LC_MESSAGES=$${LC_MESSAGES:-$${LC_ALL:-$${LANG}}} LANG=C man'|| die "emake failed"
+	make || make || die "make failed"
 }
 
 src_install() {
+
 	make DESTDIR=${D} install || die "make install failed"
+
 	dodoc doc/* README*
-	doman doc/w3m.1
+	#doman doc/w3m.1
 }
diff --git a/net-www/w3m/w3m-0.4.2.ebuild b/net-www/w3m/w3m-0.4.2.ebuild
index c3ca3a560911..da29b3071a8a 100644
--- a/net-www/w3m/w3m-0.4.2.ebuild
+++ b/net-www/w3m/w3m-0.4.2.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/w3m/w3m-0.4.2.ebuild,v 1.1 2003/09/23 01:11:03 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.2.ebuild,v 1.2 2003/09/25 08:45:00 usata Exp $
 
 inherit eutils
 
@@ -28,9 +28,16 @@ DEPEND=">=sys-libs/ncurses-5.2-r3
 PROVIDE="virtual/textbrowser
 	virtual/w3m"
 
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/w3m-w3mman-gentoo.diff
+}
+
 src_compile() {
 
-	local myconf
+	local myconf migemo_command
 
 	use cjk && myconf="${myconf} --enable-japanese=E"
 
@@ -40,17 +47,24 @@ src_compile() {
 		myconf="${myconf} --enable-image=no"
 	fi
 
+	if has_version 'app-emacs/migemo' ; then
+		migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
+	else
+		migemo_command="no"
+	fi
+
 	econf --enable-keymap=w3m \
 		--with-editor=/usr/bin/nano \
 		--with-mailer=/bin/mail \
 		--with-browser=/usr/bin/mozilla \
 		--with-termlib=ncurses \
+		--with-migemo="${migemo_command}" \
 		`use_enable gpm mouse` \
 		`use_enable ssl digest-auth` \
 		`use_with ssl` \
 		${myconf} || die
 
-	emake MAN='env LC_MESSAGES=$${LC_MESSAGES:-$${LC_ALL:-$${LANG}}} LANG=C man'|| die "emake failed"
+	make || make || die "make failed"
 }
 
 src_install() {